diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index 7145a99b..82e599c0 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -980,62 +980,63 @@
 			EndIf
 		EndIf
 
-		If TOPPING8 = "add-show-1009" Then
-			Var showCustomCoffee = "Enable"
-			Var showCoffeeQuantity = "Enable"
+		If TOPPING2 = "add-show-1009" Then
+			If toppingID2index2 = 1060 Then
+				Var showCustomCoffee = "Enable"
+				Var showCoffeeQuantity = "Enable"
 
-			If toppingID8Default = "" Then
-				Var CustomCoffeeQuantityState[0] = "PressForever"
-			Else
-
-				If toppingID8index1 = toppingID8Default Then
-					Var CurrentCoffeeQuantityId = toppingID8index1
+				If toppingID2Default = "" Then
 					Var CustomCoffeeQuantityState[0] = "PressForever"
-					Var CustomCoffeeQuantityState[1] = "Enable"
-					Var CustomCoffeeQuantityState[2] = "Enable"
+				Else
 
+					If toppingID2index1 = toppingID2Default Then
+						Var CurrentCoffeeQuantityId = toppingID2index1
+						Var CustomCoffeeQuantityState[0] = "PressForever"
+						Var CustomCoffeeQuantityState[1] = "Enable"
+						Var CustomCoffeeQuantityState[2] = "Enable"
+
+					EndIf
+
+					If toppingID2index2 = toppingID2Default Then
+						Var CurrentCoffeeQuantityId = toppingID2index2
+						Var CustomCoffeeQuantityState[0] = "Enable"
+						Var CustomCoffeeQuantityState[1] = "PressForever"
+						Var CustomCoffeeQuantityState[2] = "Enable"
+					EndIf
+
+					If toppingID2index3 = toppingID2Default Then
+						Var CurrentCoffeeQuantityId = toppingID2index3
+						Var CustomCoffeeQuantityState[0] = "Enable"
+						Var CustomCoffeeQuantityState[1] = "Enable"
+						Var CustomCoffeeQuantityState[2] = "PressForever"
+					EndIf
 				EndIf
 
-				If toppingID8index2 = toppingID8Default Then
-					Var CurrentCoffeeQuantityId = toppingID8index2
-					Var CustomCoffeeQuantityState[0] = "Enable"
-					Var CustomCoffeeQuantityState[1] = "PressForever"
-					Var CustomCoffeeQuantityState[2] = "Enable"
-				EndIf
 
-				If toppingID8index3 = toppingID8Default Then
-					Var CurrentCoffeeQuantityId = toppingID8index3
-					Var CustomCoffeeQuantityState[0] = "Enable"
-					Var CustomCoffeeQuantityState[1] = "Enable"
-					Var CustomCoffeeQuantityState[2] = "PressForever"
-				EndIf
+	;			If toppingID2index1price > 0 Then
+	;				Var priceFormated !assigned StringFmt( toppingID2index1price , PriceCustomCoffeeFormat, PreScaleConvertShow)
+	;				Var CustomCoffeeQuantityAdditionalPrice[0] = "(+" + priceFormated
+	;				Var CustomCoffeeQuantityAdditionalPrice[0] = CustomCoffeeQuantityAdditionalPrice[0] + ")"
+	;			Else
+	;				Var CustomCoffeeQuantityAdditionalPrice[0] = ""
+	;			EndIf
+	;
+	;			If toppingID2index2price > 0 Then
+	;				Var priceFormated !assigned StringFmt( toppingID2index2price , PriceCustomCoffeeFormat, PreScaleConvertShow)
+	;				Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
+	;				Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
+	;			Else
+	;				Var CustomCoffeeQuantityAdditionalPrice[1] = ""
+	;			EndIf
+	;
+	;			If toppingID2index3price > 0 Then
+	;				Var priceFormated !assigned StringFmt( toppingID2index3price , PriceCustomCoffeeFormat, PreScaleConvertShow)
+	;				Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
+	;				Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
+	;			Else
+	;				Var CustomCoffeeQuantityAdditionalPrice[2] = ""
+	;			EndIf
 			EndIf
-
-
-			If toppingID8index1price > 0 Then
-				Var priceFormated !assigned StringFmt( toppingID8index1price , PriceCustomCoffeeFormat, PreScaleConvertShow)
-				Var CustomCoffeeQuantityAdditionalPrice[0] = "(+" + priceFormated
-				Var CustomCoffeeQuantityAdditionalPrice[0] = CustomCoffeeQuantityAdditionalPrice[0] + ")"
-			Else
-				Var CustomCoffeeQuantityAdditionalPrice[0] = ""
-			EndIf
-
-			If toppingID8index2price > 0 Then
-				Var priceFormated !assigned StringFmt( toppingID8index2price , PriceCustomCoffeeFormat, PreScaleConvertShow)
-				Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
-				Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
-			Else
-				Var CustomCoffeeQuantityAdditionalPrice[1] = ""
-			EndIf
-
-			If toppingID8index3price > 0 Then
-				Var priceFormated !assigned StringFmt( toppingID8index3price , PriceCustomCoffeeFormat, PreScaleConvertShow)
-				Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
-				Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
-			Else
-				Var CustomCoffeeQuantityAdditionalPrice[2] = ""
-			EndIf
-
 		EndIf
 
 		If TOPPING9 = "single-shot-espv2" Then
@@ -1795,11 +1796,6 @@
 					Var showShotEnable = "Invisible"
 					Var ExtraTopping = "Enable"
 				EndIf
-
-				If toppingID2index2 = 1060 Then
-					Var showCustomCoffee = "Enable"
-					var showCoffeeQuantity = "Enable"
-				EndIf
 				
 				DEBUGVAR TOPPING2
 				Refresh
@@ -4918,16 +4914,16 @@
 	
 		If showCoffeeQuantity = "Enable" Then
 			If CustomCoffeeQuantityState[0] = "PressForever" Then
-				Var topping8 = toppingID8index1
+				Var topping2 = toppingID2index1
 			EndIf
 			If CustomCoffeeQuantityState[1] = "PressForever" Then
-				Var topping8 = toppingID8index2
+				Var topping2 = toppingID2index2
 			EndIf
 			If CustomCoffeeQuantityState[2] = "PressForever" Then
-				Var topping8 = toppingID8index3
+				Var topping2 = toppingID2index3
 			EndIf
 		Else
-			Var topping8 = 0
+			Var topping2 = 0
 		EndIf
 
 		If showCoffeeLevel = "Enable" Then
@@ -4958,6 +4954,7 @@
 			Var topping10 = 0
 		EndIf
 	Else
+		Var topping2 = 0
 		Var topping7 = 0
 		Var topping8 = 0
 		Var topping9 = 0