diff --git a/topics/grammars/ada/kempe/config.edd b/topics/grammars/ada/kempe/config.edd
index 11d6d3c2..c2d72831 100644
--- a/topics/grammars/ada/kempe/config.edd
+++ b/topics/grammars/ada/kempe/config.edd
@@ -7,7 +7,7 @@
 	<end-option-symbol>]</end-option-symbol>
 	<start-repetition-star-symbol>{</start-repetition-star-symbol>
 	<end-repetition-star-symbol>}</end-repetition-star-symbol>
-	<undefined-nonterminals-are-terminals/>
+	<terminal-if-undefined/>
 	<nonterminal-if-contains>_</nonterminal-if-contains>
 	<nonterminal-if-uppercase/>
 	<glue-nonalphanumeric-terminals/>
diff --git a/topics/grammars/ada/lncs-2219/config.edd b/topics/grammars/ada/lncs-2219/config.edd
index cd3d43db..16393f78 100644
--- a/topics/grammars/ada/lncs-2219/config.edd
+++ b/topics/grammars/ada/lncs-2219/config.edd
@@ -7,10 +7,10 @@
 	<end-option-symbol>]</end-option-symbol>
 	<start-repetition-star-symbol>{</start-repetition-star-symbol>
 	<end-repetition-star-symbol>}</end-repetition-star-symbol>
-	<undefined-nonterminals-are-terminals>
+	<terminal-if-undefined>
 		<except>underline</except>
 		<except>digit</except>
-	</undefined-nonterminals-are-terminals>
+	</terminal-if-undefined>
 	<nonterminal-if-contains>_</nonterminal-if-contains>
 	<nonterminal-if-uppercase/>
 	<decompose-symbols>
diff --git a/topics/grammars/ada/lncs-4348/config.edd b/topics/grammars/ada/lncs-4348/config.edd
index b4d8faf7..768789cf 100644
--- a/topics/grammars/ada/lncs-4348/config.edd
+++ b/topics/grammars/ada/lncs-4348/config.edd
@@ -7,9 +7,9 @@
 	<end-option-symbol>]</end-option-symbol>
 	<start-repetition-star-symbol>{</start-repetition-star-symbol>
 	<end-repetition-star-symbol>}</end-repetition-star-symbol>
-	<undefined-nonterminals-are-terminals>
+	<terminal-if-undefined>
 		<except>underline</except>
-	</undefined-nonterminals-are-terminals>
+	</terminal-if-undefined>
 	<nonterminal-if-contains>_</nonterminal-if-contains>
 	<nonterminal-if-uppercase/>
 	<decompose-symbols>
diff --git a/topics/grammars/eiffel/bezault/config.edd b/topics/grammars/eiffel/bezault/config.edd
index b089a868..e270a7b0 100644
--- a/topics/grammars/eiffel/bezault/config.edd
+++ b/topics/grammars/eiffel/bezault/config.edd
@@ -11,7 +11,7 @@
 	<end-repetition-star-symbol>...}</end-repetition-star-symbol>
 	<start-repetition-plus-symbol>{</start-repetition-plus-symbol>
 	<end-repetition-plus-symbol>...}+</end-repetition-plus-symbol>
-	<undefined-nonterminals-are-terminals/>
+	<terminal-if-undefined/>
 	<terminal-if-uppercase/>
 	<nonterminal-if-contains>_</nonterminal-if-contains>
 	<nonterminal-if-camelcase>
diff --git a/topics/grammars/eiffel/iso-25436-2006/config.edd b/topics/grammars/eiffel/iso-25436-2006/config.edd
index 2482eaa4..82835b8f 100644
--- a/topics/grammars/eiffel/iso-25436-2006/config.edd
+++ b/topics/grammars/eiffel/iso-25436-2006/config.edd
@@ -11,7 +11,7 @@
 	<start-seplist-plus-symbol>{</start-seplist-plus-symbol>
 	<end-seplist-plus-symbol>...}+</end-seplist-plus-symbol>
 	<postfix-repetition-plus-symbol>+</postfix-repetition-plus-symbol>
-	<undefined-nonterminals-are-terminals/>
+	<terminal-if-undefined/>
 	<nonterminal-if-contains>_</nonterminal-if-contains>
 	<nonterminal-if-camelcase>
 		<except>Result</except>
diff --git a/topics/grammars/eiffel/iso-25436-2006/post-extract.xbgf b/topics/grammars/eiffel/iso-25436-2006/post-extract.xbgf
index 778854f8..a2514124 100644
--- a/topics/grammars/eiffel/iso-25436-2006/post-extract.xbgf
+++ b/topics/grammars/eiffel/iso-25436-2006/post-extract.xbgf
@@ -9,4 +9,16 @@
 			<terminal>C++</terminal>
 		</bgf:expression>
 	</xbgf:replace>
+	<!-- An underscore can be a part of a nonterminal name, but it can also be a terminal (part of numbers) -->
+	<xbgf:replace>
+		<bgf:expression>
+			<nonterminal>_</nonterminal>
+		</bgf:expression>
+		<bgf:expression>
+			<terminal>_</terminal>
+		</bgf:expression>
+		<in>
+			<nonterminal>Digit</nonterminal>
+		</in>
+	</xbgf:replace>
 </xbgf:sequence>
diff --git a/topics/recovery/hunter/hunter.py b/topics/recovery/hunter/hunter.py
index 01c09fa4..1551139b 100755
--- a/topics/recovery/hunter/hunter.py
+++ b/topics/recovery/hunter/hunter.py
@@ -935,9 +935,10 @@ def balanceProd(p):
 	# balancing backward
 	i = len(p)-1
 	while i>1:
-		if p[i].find('END')<0 or p[i] in ignore_tokens:
+		if p[i].find('END-')<0 or p[i] in ignore_tokens:
 			i -= 1
 			continue
+		#print('>>>>>> Found',p[i])
 		j = startOfContext(p,i,p[i].replace('END','START'))
 		while j>-1 and p[j] in ignore_tokens:
 			j -= 1
@@ -1435,6 +1436,8 @@ def t2nt(tokens,check):
 	# STEP 6: slice insides according to definition-separator-symbol
 	step6 = False
 	for z in metasymbols:
+		if z == 'TERMINATOR-SYMBOL':
+			continue
 		s = z.lower()
 		if s in config.keys():
 			print('STEP 6: marking',repr(config[s]),'as',s+'.')