Index: sources/gui/qml/components/BaseComboBox.qml
===================================================================
diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -r4bb991b095495589cd7bafb799d4bbacb7c20c9a
--- sources/gui/qml/components/BaseComboBox.qml	(.../BaseComboBox.qml)	(revision 1132f049e169cc87a059261f72fca0ceb7d739f1)
+++ sources/gui/qml/components/BaseComboBox.qml	(.../BaseComboBox.qml)	(revision 4bb991b095495589cd7bafb799d4bbacb7c20c9a)
@@ -39,8 +39,6 @@
 
     signal clear()
 
-    onClear                 : { currentIndex    = 0 }
-
     contentItem: Text { id: _displayText
         text                : canOff && parent.displayText === "0" ? qsTr("OFF") : parent.displayText
         color               : Colors.offWhite
Index: sources/gui/qml/dialogs/DryDemoDialog.qml
===================================================================
diff -u -r20c46d34bd425f14e76ba2aacf7761cccef37753 -r4bb991b095495589cd7bafb799d4bbacb7c20c9a
--- sources/gui/qml/dialogs/DryDemoDialog.qml	(.../DryDemoDialog.qml)	(revision 20c46d34bd425f14e76ba2aacf7761cccef37753)
+++ sources/gui/qml/dialogs/DryDemoDialog.qml	(.../DryDemoDialog.qml)	(revision 4bb991b095495589cd7bafb799d4bbacb7c20c9a)
@@ -22,8 +22,9 @@
         RINSEBACK       ,
         RECIRCULATE     ,
         TREATMENT_STOP  ,
-        DISINFECTION    ,
+        END_TREATMENT   ,
         POST_TREATMENT  ,
+        DISINFECTION    ,
         COUNT
     }
 
@@ -73,8 +74,10 @@
             model[DryDemoDialog.RINSEBACK]          = qsTr("Rinseback")
             model[DryDemoDialog.RECIRCULATE]        = qsTr("Recirculate")
             model[DryDemoDialog.TREATMENT_STOP]     = qsTr("Treatment Stop")
-            model[DryDemoDialog.DISINFECTION]       = qsTr("Disinfection")
+            model[DryDemoDialog.END_TREATMENT]      = qsTr("End Treatment")
             model[DryDemoDialog.POST_TREATMENT]     = qsTr("Post-Treatment")
+            model[DryDemoDialog.DISINFECTION]       = qsTr("Disinfection")
+
             itemsText = model
         }
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -r4b86351821cd865f5d0383190a17b2137f79f9aa -r4bb991b095495589cd7bafb799d4bbacb7c20c9a
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 4b86351821cd865f5d0383190a17b2137f79f9aa)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 4bb991b095495589cd7bafb799d4bbacb7c20c9a)
@@ -63,6 +63,9 @@
             vTreatmentCreate.treatmentDuration          = vTreatmentRanges.treatmentDurationDef
             vTreatmentCreate.ultrafiltrationVolume      = vTreatmentRanges.ultrafiltrationVolumeDef
             vTreatmentCreate.dialysateTemp              = vTreatmentRanges.dialysateTempDef
+            vTreatmentCreate.acidConcentrate            = 0
+            vTreatmentCreate.dryBicarbCartSize          = 0
+            vTreatmentCreate.dialyzerType               = 0
         }
     }