diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index b3851afca8..b1bc7bb139 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -11731,8 +11731,8 @@
                                         <input type="text" name="attr_scroll" class="sheet-rogue-min sheet-chrome" title="@{repeating_scrolls_$X_scroll}" placeholder="Name of Scroll/Spell." list="scroll-spells">
                                         <input type="text" name="attr_scroll" class="sheet-rogue-min sheet-firefox" title="@{repeating_scrolls_$X_scroll}" placeholder="Name of Scroll/Spell." list="scroll-spells-ff">
                                     </td>
-                                    <td><input type="number" name="attr_scroll-level" title="@{repeating_scrolls_$X_scroll-level}" value="6"></td>
-                                    <td><input type="number" name="attr_scrollqty" title="@{repeating_scrolls_$X_scrollqty}" placeholder="#"></td>
+                                    <td><input type="number" name="attr_scroll-level" title="@{repeating_scrolls_$X_scroll-level}" class="sheet-minish" value="6"></td>
+                                    <td><input type="number" name="attr_scrollqty" title="@{repeating_scrolls_$X_scrollqty}" class="sheet-minish" placeholder="#"></td>
                                     <td><input type="text" name="attr_scroll-speed" title="@{repeating_scrolls_$X_scroll-speed}" class="sheet-small" value="3"></td>
                                     <td><button type="roll" name="attr_scroll-initiative" title="%{repeating_scrolls_$X_scroll-initiative}" value="/gmroll [[{([[1d10]]+[[@{scroll-speed}-(@{misc-mod})]]), 1}kh1]] [Initiative (@{scroll})]&{tracker}">Initiative</button></td>
                                     <td><button type="roll" name="attr_scroll-roll" title="%{repeating_scrolls_$X_scroll-roll}" value="@{scroll-macro}">T</button></td>
@@ -11740,7 +11740,7 @@
                                 </tr>
                                 <tr class="sheet-hidden">
                                     <td class="sheet-default-header">Spell failure:</td>
-                                    <td><input type="number" name="attr_scroll-failure" title="@{repeating_scrolls_$X_scroll-failure}" value="0"></td>
+                                    <td><input type="number" name="attr_scroll-failure" title="@{repeating_scrolls_$X_scroll-failure}" class="sheet-minish" value="0"></td>
                                     <td style="font-weight: bold">%</td>
                                 </tr>
                                 <tr class="sheet-hidden">
@@ -25617,8 +25617,6 @@
   <option value="Scroll of Command"></option>
   <option value="Scroll of Create Water"></option>
   <option value="Scroll of Cure Light Wounds"></option>
-  <option value="Scroll of Detect Evil"></option>
-  <option value="Scroll of Detect Magic"></option>
   <option value="Scroll of Detect Poison"></option>
   <option value="Scroll of Detect Snares & Pits"></option>
   <option value="Scroll of Endure Cold/Endure Heat"></option>
@@ -25626,11 +25624,9 @@
   <option value="Scroll of Faerie Fire"></option>
   <option value="Scroll of Invisibility to Animals"></option>
   <option value="Scroll of Invisibility to Undead"></option>
-  <option value="Scroll of Light"></option>
   <option value="Scroll of Locate Animals or Plants"></option>
   <option value="Scroll of Magical Stone"></option>
   <option value="Scroll of Pass Without Trace"></option>
-  <option value="Scroll of Protection From Evil"></option>
   <option value="Scroll of Purify Food & Drink"></option>
   <option value="Scroll of Remove Fear"></option>
   <option value="Scroll of Sanctuary"></option>
@@ -25683,12 +25679,9 @@
   <option value="Scroll of Dust Devil"></option>
   <option value="Scroll of Enthrall"></option>
   <option value="Scroll of Find Traps"></option>
-  <option value="Scroll of Fire Trap"></option>
   <option value="Scroll of Flame Blade"></option>
   <option value="Scroll of Goodberry"></option>
   <option value="Scroll of Heat Metal"></option>
-  <option value="Scroll of Hold Person"></option>
-  <option value="Scroll of Know Alignment"></option>
   <option value="Scroll of Messenger"></option>
   <option value="Scroll of Obscurement"></option>
   <option value="Scroll of Produce Flame"></option>
@@ -25720,8 +25713,6 @@
   <option value="Scroll of Rally"></option>
   <option value="Scroll of Sanctify"></option>
   <option value="Scroll of Zone of Truth"></option>
-  <option value="Scroll of Camouflage"></option>
-  <option value="Scroll of Seeking"></option>
   <option value="Scroll of Animal Eyes"></option>
   <option value="Scroll of Locate Animal Follower"></option>
   <option value="Scroll of Animal Spy"></option>
@@ -25739,35 +25730,25 @@
   <option value="Scroll of Restore Strength"></option>
   <option value="Scroll of Soften Earth and Stone"></option>
   <option value="Scroll of Watery Fist"></option>
-  <option value="Scroll of Animate Dead"></option>
   <option value="Scroll of Call Lightning"></option>
-  <option value="Scroll of Continual Light"></option>
   <option value="Scroll of Create Food & Water"></option>
   <option value="Scroll of Cure Blindness or Deafness"></option>
   <option value="Scroll of Cure Disease"></option>
-  <option value="Scroll of Dispel Magic"></option>
-  <option value="Scroll of Feign Death"></option>
   <option value="Scroll of Flame Walk"></option>
   <option value="Scroll of Glyph of Warding"></option>
   <option value="Scroll of Hold Animal"></option>
-  <option value="Scroll of Locate Object"></option>
   <option value="Scroll of Magical Vestment"></option>
   <option value="Scroll of Meld Into Stone"></option>
   <option value="Scroll of Negative Plane Protection"></option>
-  <option value="Scroll of Plant Growth"></option>
   <option value="Scroll of Prayer"></option>
   <option value="Scroll of Protection From Fire"></option>
-  <option value="Scroll of Pyrotechnics"></option>
-  <option value="Scroll of Remove Curse"></option>
   <option value="Scroll of Remove Paralysis"></option>
   <option value="Scroll of Snare"></option>
   <option value="Scroll of Speak With Dead"></option>
   <option value="Scroll of Spike Growth"></option>
   <option value="Scroll of Starshine"></option>
-  <option value="Scroll of Stone Shape"></option>
   <option value="Scroll of Summon Insects"></option>
   <option value="Scroll of Tree"></option>
-  <option value="Scroll of Water Breathing"></option>
   <option value="Scroll of Water Walk"></option>
   <option value="Scroll of Accelerate Healing"></option>
   <option value="Scroll of Adaptation"></option>
@@ -25807,7 +25788,6 @@
   <option value="Scroll of Control Animal"></option>
   <option value="Scroll of Detect Spirits"></option>
   <option value="Scroll of Dictate"></option>
-  <option value="Scroll of Etherealness"></option>
   <option value="Scroll of Fortify (S&M)"></option>
   <option value="Scroll of Summon Animal Spirit"></option>
   <option value="Scroll of Hold Poison"></option>
@@ -25828,7 +25808,6 @@
   <option value="Scroll of Hallucinatory Forest"></option>
   <option value="Scroll of Hold Plant"></option>
   <option value="Scroll of Imbue With Spell Ability"></option>
-  <option value="Scroll of Lower Water"></option>
   <option value="Scroll of Neutralize Poison"></option>
   <option value="Scroll of Plant Door"></option>
   <option value="Scroll of Produce Fire"></option>
@@ -25839,7 +25818,6 @@
   <option value="Scroll of Speak With Plants"></option>
   <option value="Scroll of Spell Immunity"></option>
   <option value="Scroll of Sticks to Snakes"></option>
-  <option value="Scroll of Tongues"></option>
   <option value="Scroll of Addition"></option>
   <option value="Scroll of Age Plant"></option>
   <option value="Scroll of Blessed Warmth"></option>
@@ -25884,7 +25862,6 @@
   <option value="Scroll of Unfailing Endurance"></option>
   <option value="Scroll of Windborne"></option>
   <option value="Scroll of Air Walk"></option>
-  <option value="Scroll of Animal Growth"></option>
   <option value="Scroll of Animal Summoning II"></option>
   <option value="Scroll of Antiplant Shell"></option>
   <option value="Scroll of Atonement"></option>
@@ -25903,9 +25880,6 @@
   <option value="Scroll of Rainbow"></option>
   <option value="Scroll of Raise Dead"></option>
   <option value="Scroll of Spike Stones"></option>
-  <option value="Scroll of Transmute Rock to Mud"></option>
-  <option value="Scroll of True Seeing"></option>
-  <option value="Scroll of Wall of Fire"></option>
   <option value="Scroll of Age Object"></option>
   <option value="Scroll of Barrier of Retention"></option>
   <option value="Scroll of Blessed Abundance"></option>
@@ -25949,7 +25923,6 @@
   <option value="Scroll of Animate Object"></option>
   <option value="Scroll of Antianimal Shell"></option>
   <option value="Scroll of Blade Barrier"></option>
-  <option value="Scroll of Conjure Animals"></option>
   <option value="Scroll of Conjure Fire Elemental"></option>
   <option value="Scroll of Find the Path"></option>
   <option value="Scroll of Fire Seeds"></option>
@@ -25957,10 +25930,8 @@
   <option value="Scroll of Heal"></option>
   <option value="Scroll of Heroes' Feast"></option>
   <option value="Scroll of Liveoak"></option>
-  <option value="Scroll of Part Water"></option>
   <option value="Scroll of Speak With Monsters"></option>
   <option value="Scroll of Stone Tell"></option>
-  <option value="Scroll of Transmute Water to Dust"></option>
   <option value="Scroll of Transport Via Plants"></option>
   <option value="Scroll of Turn Wood"></option>
   <option value="Scroll of Wall of Thorns"></option>
@@ -25990,25 +25961,19 @@
   <option value="Scroll of Entropy Shield"></option>
   <option value="Scroll of Whirlwind"></option>
   <option value="Scroll of Animate Rock"></option>
-  <option value="Scroll of Astral Spell"></option>
   <option value="Scroll of Changestaff"></option>
   <option value="Scroll of Chariot of Sustarre"></option>
-  <option value="Scroll of Confusion"></option>
   <option value="Scroll of Conjure Earth Elemental"></option>
-  <option value="Scroll of Control Weather"></option>
   <option value="Scroll of Creeping Doom"></option>
   <option value="Scroll of Earthquake"></option>
   <option value="Scroll of Exaction"></option>
   <option value="Scroll of Fire Storm"></option>
-  <option value="Scroll of Gate"></option>
   <option value="Scroll of Holy Word"></option>
   <option value="Scroll of Regenerate"></option>
   <option value="Scroll of Reincarnate"></option>
   <option value="Scroll of Restoration"></option>
   <option value="Scroll of Resurrection"></option>
-  <option value="Scroll of Succor"></option>
   <option value="Scroll of Sunray"></option>
-  <option value="Scroll of Symbol"></option>
   <option value="Scroll of Transmute Metal to Wood"></option>
   <option value="Scroll of Wind Walk"></option>
   <option value="Scroll of Age Dragon"></option>
@@ -69305,7 +69270,7 @@ on('change:repeating_scrolls:scroll', async function (eventInfo) {
     let spell;
     let spellClass;
     if (wizardSpell && priestSpell) {
-        spellClass = await extractQueryResult('?{Is this a Wizard or Priest scroll?|Wizard|Priest}');
+        spellClass = await extractQueryResult(`?{Is ${eventInfo.newValue} a Wizard or Priest scroll?|Wizard|Priest}`);
         spell = spellClass === 'Wizard' ? wizardSpell : priestSpell;
     } else if (wizardSpell) {
         spell = wizardSpell;
@@ -69368,9 +69333,9 @@ on('change:repeating_scrolls:scroll', async function (eventInfo) {
             recommendedMinimumLevel = spellLevel*2+1
         }
 
-        let scribeLevel = await extractQueryResult(`?{At what level is this scroll scribed? (Recommended minimum is ${recommendedMinimumLevel}th level)|${recommendedMinimumLevel}}`);
+        let scribeLevel = await extractQueryResult(`?{At what level is ${eventInfo.newValue} scribed? (Recommended minimum is ${recommendedMinimumLevel}th level)|${recommendedMinimumLevel}}`);
 
-        let spellFailure = await extractQueryResult('?{What is the risk of spell failure for this scroll? (If you do not use this rule, set the value to 0)|0}');
+        let spellFailure = await extractQueryResult(`?{What is the risk of spell failure for ${eventInfo.newValue}? (If you do not use this rule, set the value to 0)|0}`);
 
         let scrollInfo = {
             [`repeating_scrolls_${parse.rowId}_scroll-speed`]: spell['cast-time'],
diff --git a/ADnD_2E_Revised/html/components/dynamicDatalists.html b/ADnD_2E_Revised/html/components/dynamicDatalists.html
index 672dc245b7..e749d1611b 100644
--- a/ADnD_2E_Revised/html/components/dynamicDatalists.html
+++ b/ADnD_2E_Revised/html/components/dynamicDatalists.html
@@ -5528,8 +5528,6 @@
   <option value="Scroll of Command"></option>
   <option value="Scroll of Create Water"></option>
   <option value="Scroll of Cure Light Wounds"></option>
-  <option value="Scroll of Detect Evil"></option>
-  <option value="Scroll of Detect Magic"></option>
   <option value="Scroll of Detect Poison"></option>
   <option value="Scroll of Detect Snares & Pits"></option>
   <option value="Scroll of Endure Cold/Endure Heat"></option>
@@ -5537,11 +5535,9 @@
   <option value="Scroll of Faerie Fire"></option>
   <option value="Scroll of Invisibility to Animals"></option>
   <option value="Scroll of Invisibility to Undead"></option>
-  <option value="Scroll of Light"></option>
   <option value="Scroll of Locate Animals or Plants"></option>
   <option value="Scroll of Magical Stone"></option>
   <option value="Scroll of Pass Without Trace"></option>
-  <option value="Scroll of Protection From Evil"></option>
   <option value="Scroll of Purify Food & Drink"></option>
   <option value="Scroll of Remove Fear"></option>
   <option value="Scroll of Sanctuary"></option>
@@ -5594,12 +5590,9 @@
   <option value="Scroll of Dust Devil"></option>
   <option value="Scroll of Enthrall"></option>
   <option value="Scroll of Find Traps"></option>
-  <option value="Scroll of Fire Trap"></option>
   <option value="Scroll of Flame Blade"></option>
   <option value="Scroll of Goodberry"></option>
   <option value="Scroll of Heat Metal"></option>
-  <option value="Scroll of Hold Person"></option>
-  <option value="Scroll of Know Alignment"></option>
   <option value="Scroll of Messenger"></option>
   <option value="Scroll of Obscurement"></option>
   <option value="Scroll of Produce Flame"></option>
@@ -5631,8 +5624,6 @@
   <option value="Scroll of Rally"></option>
   <option value="Scroll of Sanctify"></option>
   <option value="Scroll of Zone of Truth"></option>
-  <option value="Scroll of Camouflage"></option>
-  <option value="Scroll of Seeking"></option>
   <option value="Scroll of Animal Eyes"></option>
   <option value="Scroll of Locate Animal Follower"></option>
   <option value="Scroll of Animal Spy"></option>
@@ -5650,35 +5641,25 @@
   <option value="Scroll of Restore Strength"></option>
   <option value="Scroll of Soften Earth and Stone"></option>
   <option value="Scroll of Watery Fist"></option>
-  <option value="Scroll of Animate Dead"></option>
   <option value="Scroll of Call Lightning"></option>
-  <option value="Scroll of Continual Light"></option>
   <option value="Scroll of Create Food & Water"></option>
   <option value="Scroll of Cure Blindness or Deafness"></option>
   <option value="Scroll of Cure Disease"></option>
-  <option value="Scroll of Dispel Magic"></option>
-  <option value="Scroll of Feign Death"></option>
   <option value="Scroll of Flame Walk"></option>
   <option value="Scroll of Glyph of Warding"></option>
   <option value="Scroll of Hold Animal"></option>
-  <option value="Scroll of Locate Object"></option>
   <option value="Scroll of Magical Vestment"></option>
   <option value="Scroll of Meld Into Stone"></option>
   <option value="Scroll of Negative Plane Protection"></option>
-  <option value="Scroll of Plant Growth"></option>
   <option value="Scroll of Prayer"></option>
   <option value="Scroll of Protection From Fire"></option>
-  <option value="Scroll of Pyrotechnics"></option>
-  <option value="Scroll of Remove Curse"></option>
   <option value="Scroll of Remove Paralysis"></option>
   <option value="Scroll of Snare"></option>
   <option value="Scroll of Speak With Dead"></option>
   <option value="Scroll of Spike Growth"></option>
   <option value="Scroll of Starshine"></option>
-  <option value="Scroll of Stone Shape"></option>
   <option value="Scroll of Summon Insects"></option>
   <option value="Scroll of Tree"></option>
-  <option value="Scroll of Water Breathing"></option>
   <option value="Scroll of Water Walk"></option>
   <option value="Scroll of Accelerate Healing"></option>
   <option value="Scroll of Adaptation"></option>
@@ -5718,7 +5699,6 @@
   <option value="Scroll of Control Animal"></option>
   <option value="Scroll of Detect Spirits"></option>
   <option value="Scroll of Dictate"></option>
-  <option value="Scroll of Etherealness"></option>
   <option value="Scroll of Fortify (S&M)"></option>
   <option value="Scroll of Summon Animal Spirit"></option>
   <option value="Scroll of Hold Poison"></option>
@@ -5739,7 +5719,6 @@
   <option value="Scroll of Hallucinatory Forest"></option>
   <option value="Scroll of Hold Plant"></option>
   <option value="Scroll of Imbue With Spell Ability"></option>
-  <option value="Scroll of Lower Water"></option>
   <option value="Scroll of Neutralize Poison"></option>
   <option value="Scroll of Plant Door"></option>
   <option value="Scroll of Produce Fire"></option>
@@ -5750,7 +5729,6 @@
   <option value="Scroll of Speak With Plants"></option>
   <option value="Scroll of Spell Immunity"></option>
   <option value="Scroll of Sticks to Snakes"></option>
-  <option value="Scroll of Tongues"></option>
   <option value="Scroll of Addition"></option>
   <option value="Scroll of Age Plant"></option>
   <option value="Scroll of Blessed Warmth"></option>
@@ -5795,7 +5773,6 @@
   <option value="Scroll of Unfailing Endurance"></option>
   <option value="Scroll of Windborne"></option>
   <option value="Scroll of Air Walk"></option>
-  <option value="Scroll of Animal Growth"></option>
   <option value="Scroll of Animal Summoning II"></option>
   <option value="Scroll of Antiplant Shell"></option>
   <option value="Scroll of Atonement"></option>
@@ -5814,9 +5791,6 @@
   <option value="Scroll of Rainbow"></option>
   <option value="Scroll of Raise Dead"></option>
   <option value="Scroll of Spike Stones"></option>
-  <option value="Scroll of Transmute Rock to Mud"></option>
-  <option value="Scroll of True Seeing"></option>
-  <option value="Scroll of Wall of Fire"></option>
   <option value="Scroll of Age Object"></option>
   <option value="Scroll of Barrier of Retention"></option>
   <option value="Scroll of Blessed Abundance"></option>
@@ -5860,7 +5834,6 @@
   <option value="Scroll of Animate Object"></option>
   <option value="Scroll of Antianimal Shell"></option>
   <option value="Scroll of Blade Barrier"></option>
-  <option value="Scroll of Conjure Animals"></option>
   <option value="Scroll of Conjure Fire Elemental"></option>
   <option value="Scroll of Find the Path"></option>
   <option value="Scroll of Fire Seeds"></option>
@@ -5868,10 +5841,8 @@
   <option value="Scroll of Heal"></option>
   <option value="Scroll of Heroes' Feast"></option>
   <option value="Scroll of Liveoak"></option>
-  <option value="Scroll of Part Water"></option>
   <option value="Scroll of Speak With Monsters"></option>
   <option value="Scroll of Stone Tell"></option>
-  <option value="Scroll of Transmute Water to Dust"></option>
   <option value="Scroll of Transport Via Plants"></option>
   <option value="Scroll of Turn Wood"></option>
   <option value="Scroll of Wall of Thorns"></option>
@@ -5901,25 +5872,19 @@
   <option value="Scroll of Entropy Shield"></option>
   <option value="Scroll of Whirlwind"></option>
   <option value="Scroll of Animate Rock"></option>
-  <option value="Scroll of Astral Spell"></option>
   <option value="Scroll of Changestaff"></option>
   <option value="Scroll of Chariot of Sustarre"></option>
-  <option value="Scroll of Confusion"></option>
   <option value="Scroll of Conjure Earth Elemental"></option>
-  <option value="Scroll of Control Weather"></option>
   <option value="Scroll of Creeping Doom"></option>
   <option value="Scroll of Earthquake"></option>
   <option value="Scroll of Exaction"></option>
   <option value="Scroll of Fire Storm"></option>
-  <option value="Scroll of Gate"></option>
   <option value="Scroll of Holy Word"></option>
   <option value="Scroll of Regenerate"></option>
   <option value="Scroll of Reincarnate"></option>
   <option value="Scroll of Restoration"></option>
   <option value="Scroll of Resurrection"></option>
-  <option value="Scroll of Succor"></option>
   <option value="Scroll of Sunray"></option>
-  <option value="Scroll of Symbol"></option>
   <option value="Scroll of Transmute Metal to Wood"></option>
   <option value="Scroll of Wind Walk"></option>
   <option value="Scroll of Age Dragon"></option>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html
index 3d0286c4e9..6149daaa92 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html
@@ -446,8 +446,8 @@
                                     <input type="text" name="attr_scroll" class="sheet-rogue-min sheet-chrome" title="@{repeating_scrolls_$X_scroll}" placeholder="Name of Scroll/Spell." list="scroll-spells">
                                     <input type="text" name="attr_scroll" class="sheet-rogue-min sheet-firefox" title="@{repeating_scrolls_$X_scroll}" placeholder="Name of Scroll/Spell." list="scroll-spells-ff">
                                 </td>
-                                <td><input type="number" name="attr_scroll-level" title="@{repeating_scrolls_$X_scroll-level}" value="6"></td>
-                                <td><input type="number" name="attr_scrollqty" title="@{repeating_scrolls_$X_scrollqty}" placeholder="#"></td>
+                                <td><input type="number" name="attr_scroll-level" title="@{repeating_scrolls_$X_scroll-level}" class="sheet-minish" value="6"></td>
+                                <td><input type="number" name="attr_scrollqty" title="@{repeating_scrolls_$X_scrollqty}" class="sheet-minish" placeholder="#"></td>
                                 <td><input type="text" name="attr_scroll-speed" title="@{repeating_scrolls_$X_scroll-speed}" class="sheet-small" value="3"></td>
                                 <td><button type="roll" name="attr_scroll-initiative" title="%{repeating_scrolls_$X_scroll-initiative}" value="/gmroll [[{([[1d10]]+[[@{scroll-speed}-(@{misc-mod})]]), 1}kh1]] [Initiative (@{scroll})]&{tracker}">Initiative</button></td>
                                 <td><button type="roll" name="attr_scroll-roll" title="%{repeating_scrolls_$X_scroll-roll}" value="@{scroll-macro}">T</button></td>
@@ -455,7 +455,7 @@
                             </tr>
                             <tr class="sheet-hidden">
                                 <td class="sheet-default-header">Spell failure:</td>
-                                <td><input type="number" name="attr_scroll-failure" title="@{repeating_scrolls_$X_scroll-failure}" value="0"></td>
+                                <td><input type="number" name="attr_scroll-failure" title="@{repeating_scrolls_$X_scroll-failure}" class="sheet-minish" value="0"></td>
                                 <td style="font-weight: bold">%</td>
                             </tr>
                             <tr class="sheet-hidden">
diff --git a/ADnD_2E_Revised/javascript/sheetWorkers.js b/ADnD_2E_Revised/javascript/sheetWorkers.js
index c2740b8b69..d20825be80 100644
--- a/ADnD_2E_Revised/javascript/sheetWorkers.js
+++ b/ADnD_2E_Revised/javascript/sheetWorkers.js
@@ -2542,7 +2542,7 @@ on('change:repeating_scrolls:scroll', async function (eventInfo) {
     let spell;
     let spellClass;
     if (wizardSpell && priestSpell) {
-        spellClass = await extractQueryResult('?{Is this a Wizard or Priest scroll?|Wizard|Priest}');
+        spellClass = await extractQueryResult(`?{Is ${eventInfo.newValue} a Wizard or Priest scroll?|Wizard|Priest}`);
         spell = spellClass === 'Wizard' ? wizardSpell : priestSpell;
     } else if (wizardSpell) {
         spell = wizardSpell;
@@ -2605,9 +2605,9 @@ on('change:repeating_scrolls:scroll', async function (eventInfo) {
             recommendedMinimumLevel = spellLevel*2+1
         }
 
-        let scribeLevel = await extractQueryResult(`?{At what level is this scroll scribed? (Recommended minimum is ${recommendedMinimumLevel}th level)|${recommendedMinimumLevel}}`);
+        let scribeLevel = await extractQueryResult(`?{At what level is ${eventInfo.newValue} scribed? (Recommended minimum is ${recommendedMinimumLevel}th level)|${recommendedMinimumLevel}}`);
 
-        let spellFailure = await extractQueryResult('?{What is the risk of spell failure for this scroll? (If you do not use this rule, set the value to 0)|0}');
+        let spellFailure = await extractQueryResult(`?{What is the risk of spell failure for ${eventInfo.newValue}? (If you do not use this rule, set the value to 0)|0}`);
 
         let scrollInfo = {
             [`repeating_scrolls_${parse.rowId}_scroll-speed`]: spell['cast-time'],
diff --git a/ADnD_2E_Revised/pug/spellScrollsDatalists.pug b/ADnD_2E_Revised/pug/spellScrollsDatalists.pug
index de514e3d71..d70f237cea 100644
--- a/ADnD_2E_Revised/pug/spellScrollsDatalists.pug
+++ b/ADnD_2E_Revised/pug/spellScrollsDatalists.pug
@@ -6,8 +6,15 @@ datalist(id=`scroll-spells`)
     each spell, spellName in priestSpells['primonster']
         option(value!=getScrollName(spellName))= getDisplayLevel(spell, 'Priest')
 
+- let processedSpells = new Set()
 datalist(id=`scroll-spells-ff`)
     each spell, spellName in wizardSpells['wizmonster']
+        if processedSpells.has(spellName)
+            - continue
+        - processedSpells.add(spellName)
         option(value!=getScrollName(spellName))
     each spell, spellName in priestSpells['primonster']
+        if processedSpells.has(spellName)
+            - continue
+        - processedSpells.add(spellName)
         option(value!=getScrollName(spellName))
\ No newline at end of file