diff --git a/Note Types/AnKing MCAT/Back Template.html b/Note Types/AnKing MCAT/Back Template.html
index de445342..31e762c7 100644
--- a/Note Types/AnKing MCAT/Back Template.html	
+++ b/Note Types/AnKing MCAT/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
@@ -524,7 +524,7 @@
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -553,11 +553,11 @@
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/Note Types/AnKing MCAT/Front Template.html b/Note Types/AnKing MCAT/Front Template.html
index 796ccbfe..2c0bddd4 100644
--- a/Note Types/AnKing MCAT/Front Template.html	
+++ b/Note Types/AnKing MCAT/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 
@@ -195,7 +195,7 @@
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -239,11 +239,11 @@
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }
 
diff --git a/Note Types/AnKing/Back Template.html b/Note Types/AnKing/Back Template.html
index fa09b7f0..6caf7eba 100644
--- a/Note Types/AnKing/Back Template.html	
+++ b/Note Types/AnKing/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
  <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
@@ -491,7 +491,7 @@
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -520,11 +520,11 @@
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/Note Types/AnKing/Front Template.html b/Note Types/AnKing/Front Template.html
index 734af306..d005ee91 100644
--- a/Note Types/AnKing/Front Template.html	
+++ b/Note Types/AnKing/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 <br>
@@ -195,7 +195,7 @@
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -239,11 +239,11 @@
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }
 
diff --git a/Note Types/AnKingAnkisthesia/Back Template.html b/Note Types/AnKingAnkisthesia/Back Template.html
index 6e6cbf6a..cfba4686 100644
--- a/Note Types/AnKingAnkisthesia/Back Template.html	
+++ b/Note Types/AnKingAnkisthesia/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
  <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // Visit https://keycode.info/ to get the number/letter for the key you want to assign. 
@@ -534,7 +534,7 @@
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -563,11 +563,11 @@
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/Note Types/AnKingAnkisthesia/Front Template.html b/Note Types/AnKingAnkisthesia/Front Template.html
index 1aa2ad67..a47753f5 100644
--- a/Note Types/AnKingAnkisthesia/Front Template.html	
+++ b/Note Types/AnKingAnkisthesia/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 <!-- ##############  Text-to-speech  ##############
@@ -193,7 +193,7 @@
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -237,11 +237,11 @@
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }
 
diff --git a/Note Types/AnKingDerm/Back Template.html b/Note Types/AnKingDerm/Back Template.html
index 77a6b93e..71ec6027 100644
--- a/Note Types/AnKingDerm/Back Template.html	
+++ b/Note Types/AnKingDerm/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
@@ -590,7 +590,7 @@
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -619,11 +619,11 @@
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/Note Types/AnKingDerm/Front Template.html b/Note Types/AnKingDerm/Front Template.html
index 1cf85788..89c677bf 100644
--- a/Note Types/AnKingDerm/Front Template.html	
+++ b/Note Types/AnKingDerm/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 
@@ -196,7 +196,7 @@
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -240,11 +240,11 @@
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }
 
diff --git a/Note Types/AnKingDermPath/Back Template.html b/Note Types/AnKingDermPath/Back Template.html
index c4d8113d..44afc0cd 100644
--- a/Note Types/AnKingDermPath/Back Template.html	
+++ b/Note Types/AnKingDermPath/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
diff --git a/Note Types/AnKingDermPath/Front Template.html b/Note Types/AnKingDermPath/Front Template.html
index cdd89dbd..9066bff5 100644
--- a/Note Types/AnKingDermPath/Front Template.html	
+++ b/Note Types/AnKingDermPath/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="front">{{edit:Front}}</div>
 <div style="font-size:8px; font-style:italic;">Above Image(s) provided courtesy of Tammie Ferringer, MD</div>
 
diff --git a/Note Types/AnKingOverhaul/Back Template.html b/Note Types/AnKingOverhaul/Back Template.html
index d5f85fe1..697d3d20 100644
--- a/Note Types/AnKingOverhaul/Back Template.html	
+++ b/Note Types/AnKingOverhaul/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
@@ -776,7 +776,7 @@
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -805,11 +805,11 @@
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/Note Types/AnKingOverhaul/Front Template.html b/Note Types/AnKingOverhaul/Front Template.html
index dfe9d87f..d63591d4 100644
--- a/Note Types/AnKingOverhaul/Front Template.html	
+++ b/Note Types/AnKingOverhaul/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 <br>
@@ -195,7 +195,7 @@
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -239,11 +239,11 @@
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }
 
diff --git a/Note Types/AnKingOverlapping/Back Template.html b/Note Types/AnKingOverlapping/Back Template.html
index 86758c43..ddca3d7e 100644
--- a/Note Types/AnKingOverlapping/Back Template.html	
+++ b/Note Types/AnKingOverlapping/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
   // ##############  HINT REVEAL SHORTCUTS  ##############
   // All shortcuts will also open with "H" if using the Hint Hotkeys add-on
diff --git a/Note Types/AnKingOverlapping/Front Template.html b/Note Types/AnKingOverlapping/Front Template.html
index ce3128c4..b66c941b 100644
--- a/Note Types/AnKingOverlapping/Front Template.html	
+++ b/Note Types/AnKingOverlapping/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 <br>
diff --git a/Note Types/Basic-AnKing/Back Template.html b/Note Types/Basic-AnKing/Back Template.html
index 9a917182..2f09c916 100644
--- a/Note Types/Basic-AnKing/Back Template.html	
+++ b/Note Types/Basic-AnKing/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
diff --git a/Note Types/Basic-AnKing/Front Template.html b/Note Types/Basic-AnKing/Front Template.html
index 2cebe0ef..91480ed8 100644
--- a/Note Types/Basic-AnKing/Front Template.html	
+++ b/Note Types/Basic-AnKing/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="front">{{edit:Front}}</div>
 
 <br>
diff --git a/Note Types/Basic-AnKingLanguage/Back Template.html b/Note Types/Basic-AnKingLanguage/Back Template.html
index be3a744a..71e99d5c 100644
--- a/Note Types/Basic-AnKingLanguage/Back Template.html	
+++ b/Note Types/Basic-AnKingLanguage/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  HINT REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
diff --git a/Note Types/Basic-AnKingLanguage/Front Template.html b/Note Types/Basic-AnKingLanguage/Front Template.html
index 2cebe0ef..91480ed8 100644
--- a/Note Types/Basic-AnKingLanguage/Front Template.html	
+++ b/Note Types/Basic-AnKingLanguage/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="front">{{edit:Front}}</div>
 
 <br>
diff --git a/Note Types/IO-one by one/Back Template.html b/Note Types/IO-one by one/Back Template.html
index 99a64043..4d2c9dcd 100644
--- a/Note Types/IO-one by one/Back Template.html	
+++ b/Note Types/IO-one by one/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  OCCLUSION SHORTCUTS  ##############
 var RevealIncrementalShortcut = "N";
diff --git a/Note Types/IO-one by one/Front Template.html b/Note Types/IO-one by one/Front Template.html
index 7a6e08e9..afeb8460 100644
--- a/Note Types/IO-one by one/Front Template.html	
+++ b/Note Types/IO-one by one/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ############## USER CONFIGURATION START ##############
 // Auto flip to back when One by one mode.
diff --git a/Note Types/Physeo-Cloze/Back Template.html b/Note Types/Physeo-Cloze/Back Template.html
index 4b65a2dd..ec1d9a22 100644
--- a/Note Types/Physeo-Cloze/Back Template.html	
+++ b/Note Types/Physeo-Cloze/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
  <script>
 // ##############  BUTTON REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
@@ -503,7 +503,7 @@
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -532,11 +532,11 @@
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/Note Types/Physeo-Cloze/Front Template.html b/Note Types/Physeo-Cloze/Front Template.html
index 23b80afe..4a518428 100644
--- a/Note Types/Physeo-Cloze/Front Template.html	
+++ b/Note Types/Physeo-Cloze/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 <br>
@@ -194,7 +194,7 @@
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -238,11 +238,11 @@
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }
 
diff --git a/Note Types/Physeo-IO one by one/Back Template.html b/Note Types/Physeo-IO one by one/Back Template.html
index 2ab07836..901622b4 100644
--- a/Note Types/Physeo-IO one by one/Back Template.html	
+++ b/Note Types/Physeo-IO one by one/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ##############  OCCLUSION SHORTCUTS  ##############
 var RevealIncrementalShortcut = "N";
diff --git a/Note Types/Physeo-IO one by one/Front Template.html b/Note Types/Physeo-IO one by one/Front Template.html
index f0b3d2f0..f9ff242f 100644
--- a/Note Types/Physeo-IO one by one/Front Template.html	
+++ b/Note Types/Physeo-IO one by one/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <script>
 // ############## USER CONFIGURATION START ##############
 // Auto flip to back when One by one mode.
diff --git a/Note Types/Sketchy-Cloze/Back Template.html b/Note Types/Sketchy-Cloze/Back Template.html
index f9f4d75a..106980c0 100644
--- a/Note Types/Sketchy-Cloze/Back Template.html	
+++ b/Note Types/Sketchy-Cloze/Back Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
  <script>
 // ##############  BUTTON REVEAL SHORTCUTS  ##############
 // All shortcuts will also open with "H" if using the Hint Hotkeys add-on 
@@ -510,7 +510,7 @@
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -539,11 +539,11 @@
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/Note Types/Sketchy-Cloze/Front Template.html b/Note Types/Sketchy-Cloze/Front Template.html
index 7516edc9..2c0e13fd 100644
--- a/Note Types/Sketchy-Cloze/Front Template.html	
+++ b/Note Types/Sketchy-Cloze/Front Template.html	
@@ -1,4 +1,4 @@
-<!-- version d10be55 -->
+<!-- version 82fedac -->
 <div id="text">{{cloze:Text}}</div>
 
 <br>
@@ -194,7 +194,7 @@
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -238,11 +238,11 @@
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }
 
diff --git a/src/components/clozeOneByOneBack.ejs b/src/components/clozeOneByOneBack.ejs
index 327dbbb1..132fa525 100644
--- a/src/components/clozeOneByOneBack.ejs
+++ b/src/components/clozeOneByOneBack.ejs
@@ -53,7 +53,7 @@ _%>
   (function() {
     // enables cloze one-by-one even when one-by-one field is empty
     // minNumberOfClozes is still considered in this case
-    // overridden in importance by selectiveOneByOne
+    // overridden in importance by selectiveOneByOne and minNumberOfClozes
     var alwaysOneByOne = false;
     var clozeOneByOneEnabled = true;
     var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -84,11 +84,11 @@ _%>
     var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
     // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-    var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+    var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.clozefield .cloze').length : 0
 
     // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
     // -> show normal backside
-    if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+    if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
       clozeOneByOneEnabled = false
     }
 
diff --git a/src/components/clozeOneByOneFront.ejs b/src/components/clozeOneByOneFront.ejs
index 2d1f3d28..366bccdd 100644
--- a/src/components/clozeOneByOneFront.ejs
+++ b/src/components/clozeOneByOneFront.ejs
@@ -26,7 +26,7 @@ _%>
 <script>
   // enables cloze one-by-one even when one-by-one field is empty
   // minNumberOfClozes is still considered in this case
-  // overridden in importance by selectiveOneByOne
+  // overridden in importance by selectiveOneByOne and minNumberOfClozes
   var alwaysOneByOne = false;
   var clozeOneByOneEnabled = true;
   var oneByOneFieldNotEmpty = document.getElementById("one-by-one").textContent !== "";
@@ -72,11 +72,11 @@ _%>
       var cardNumberIsOneByOne = !clozeNumbers.filter(n => !Number.isNaN(n)).length || clozeNumbers.includes(parseInt(getCardNumber()))
 
       // check the amount of clozes -> disable OneByOne if less than minimum value wanted (minNumberOfClozes)
-      var numClozesForNumber = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
+      var numClozes = (minNumberOfClozes) ? document.querySelectorAll('.cloze').length : 0
 
       // stop OneByOne if selectiveOneByOne is not enabled for this specific card OR if OneByOne is disabled some other way
       // -> show normal backside
-      if (!alwaysOneByOne && ((selectiveOneByOne && !cardNumberIsOneByOne) || (oneByOneFieldNotEmpty && (numClozesForNumber < minNumberOfClozes)))) {
+      if (selectiveOneByOne && !cardNumberIsOneByOne || numClozes < minNumberOfClozes) {
         clozeOneByOneEnabled = false
       }