Index: sources/gui/qml/compounds/InstitutionalContainer.qml
===================================================================
diff -u -r49271f2bd039c9d15586c7c9b2f57f80c801d819 -rcca603facdefb2879d5defb8fd335a978bd63cf5
--- sources/gui/qml/compounds/InstitutionalContainer.qml	(.../InstitutionalContainer.qml)	(revision 49271f2bd039c9d15586c7c9b2f57f80c801d819)
+++ sources/gui/qml/compounds/InstitutionalContainer.qml	(.../InstitutionalContainer.qml)	(revision cca603facdefb2879d5defb8fd335a978bd63cf5)
@@ -17,7 +17,6 @@
 import "qrc:/components"
 
 import QtQuick 2.12
-import QtQuick.Controls 2.2
 
 LabelUnitContainer { id: _root
     height                                  : Variables.institutionaltContainerHeight
Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -rcca603facdefb2879d5defb8fd335a978bd63cf5
--- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision cca603facdefb2879d5defb8fd335a978bd63cf5)
@@ -78,8 +78,8 @@
             height          : _root.controlHeight
 
             contentItem : ValueAdjuster{ id: _potassiumValueControl
-                minimum         : vInstitutionalRecord.acidConcentratePotassiumMin
-                maximum         : vInstitutionalRecord.acidConcentratePotassiumMax
+                minimum         : vTreatmentRanges.acidConcentratePotassiumMin
+                maximum         : vTreatmentRanges.acidConcentratePotassiumMax
                 step            : vTreatmentRanges.acidConcentratePotassiumRes
                 defaultValue    : vTreatmentRanges.acidConcentratePotassiumDef
                 decimal         : Variables.potassiumPrecision
@@ -103,8 +103,8 @@
             height          : _root.controlHeight
 
             contentItem : ValueAdjuster { id: _calciumValueControl
-                minimum         : vInstitutionalRecord.acidConcentrateCalciumMin
-                maximum         : vInstitutionalRecord.acidConcentrateCalciumMax
+                minimum         : vTreatmentRanges.acidConcentrateCalciumMin
+                maximum         : vTreatmentRanges.acidConcentrateCalciumMax
                 step            : vTreatmentRanges.acidConcentrateCalciumRes
                 defaultValue    : vTreatmentRanges.acidConcentrateCalciumDef
                 decimal         : Variables.calciumPrecision
Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -rcca603facdefb2879d5defb8fd335a978bd63cf5
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision cca603facdefb2879d5defb8fd335a978bd63cf5)
@@ -62,13 +62,11 @@
         title.text              :   _root.disinfectTitle
 
         TouchGrid {
-//            property bool isVisible: vAdjustmentInstitutionalRecord.enableChemicalDisinfect
             width           : parent.width / 2
             itemWidth       : 400
             colCount        : 1
             colSpacing      : 0
             itemsText       : [ _root.flushTitle    , _root.heatActiveTitle       , _root.chemicalTitle   , _root.chemFlushTitle  , _root.roPermeateTitle ,  _root.heatPassiveTitle     ]
-//            itemsVisible    : [ true                , true                        , isVisible             , isVisible             , true                  ,   true                      ]
             onItemClicked   : [ doDisinfectFlush    , doDisinfectHeatActiveCool   , doDisinfectChemical   , doDisinfectChemFlush  , doDisinfectROPermeate ,   doDisinfectHeatPassiveCool][vIndex]()
         }
         Image { id: _denaliDeviceImage
Index: sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -rcca603facdefb2879d5defb8fd335a978bd63cf5
--- sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h	(.../MAdjustTDInstitutionalRecordResponse.h)	(revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h	(.../MAdjustTDInstitutionalRecordResponse.h)	(revision cca603facdefb2879d5defb8fd335a978bd63cf5)
@@ -46,21 +46,21 @@
  * | #8: (U32) | \ref Data::mTreatmentDurationMinRejectionReason                 |
  * | #9: (U32) | \ref Data::mTreatmentDurationMaxRejectionReason                 |
  * | #10:(U32) | \ref Data::mTreatmentDurationDefRejectionReason                 |
- * | #11:(F32) | \ref Data::mHeparinBolusVolumeMinRejectionReason                |
- * | #12:(F32) | \ref Data::mHeparinBolusVolumeMaxRejectionReason                |
- * | #13:(F32) | \ref Data::mHeparinBolusVolumeDefRejectionReason                |
- * | #14:(F32) | \ref Data::mHeparinDispensingRateMinRejectionReason             |
- * | #15:(F32) | \ref Data::mHeparinDispensingRateMaxRejectionReason             |
- * | #16:(F32) | \ref Data::mHeparinDispensingRateDefRejectionReason             |
+ * | #11:(U32) | \ref Data::mHeparinBolusVolumeMinRejectionReason                |
+ * | #12:(U32) | \ref Data::mHeparinBolusVolumeMaxRejectionReason                |
+ * | #13:(U32) | \ref Data::mHeparinBolusVolumeDefRejectionReason                |
+ * | #14:(U32) | \ref Data::mHeparinDispensingRateMinRejectionReason             |
+ * | #15:(U32) | \ref Data::mHeparinDispensingRateMaxRejectionReason             |
+ * | #16:(U32) | \ref Data::mHeparinDispensingRateDefRejectionReason             |
  * | #17:(U32) | \ref Data::mHeparinStopTimeMinRejectionReason                   |
  * | #18:(U32) | \ref Data::mHeparinStopTimeMaxRejectionReason                   |
- * | #19:(F32) | \ref Data::mDialysateTempMinRejectionReason                     |
- * | #20:(F32) | \ref Data::mDialysateTempMaxRejectionReason                     |
- * | #21:(F32) | \ref Data::mDialysateTempDefRejectionReason                     |
- * | #22:(F32) | \ref Data::mAcidConcentratePotassiumMinRejectionReason          |
- * | #23:(F32) | \ref Data::mAcidConcentratePotassiumMaxRejectionReason          |
- * | #24:(F32) | \ref Data::mAcidConcentrateCalciumMinRejectionReason            |
- * | #25:(F32) | \ref Data::mAcidConcentrateCalciumMaxRejectionReason            |
+ * | #19:(U32) | \ref Data::mDialysateTempMinRejectionReason                     |
+ * | #20:(U32) | \ref Data::mDialysateTempMaxRejectionReason                     |
+ * | #21:(U32) | \ref Data::mDialysateTempDefRejectionReason                     |
+ * | #22:(U32) | \ref Data::mAcidConcentratePotassiumMinRejectionReason          |
+ * | #23:(U32) | \ref Data::mAcidConcentratePotassiumMaxRejectionReason          |
+ * | #24:(U32) | \ref Data::mAcidConcentrateCalciumMinRejectionReason            |
+ * | #25:(U32) | \ref Data::mAcidConcentrateCalciumMaxRejectionReason            |
  * | #26:(U32) | \ref Data::mBicarbFinalDialysateCompositionMinRejectionReason   |
  * | #27:(U32) | \ref Data::mBicarbFinalDialysateCompositionMaxRejectionReason   |
  * | #28:(U32) | \ref Data::mBicarbFinalDialysateCompositionDefRejectionReason   |
@@ -82,19 +82,19 @@
  * | #44:(U32) | \ref Data::mTrancembrncPressureLimitWindowMinRejectionReason    |
  * | #45:(U32) | \ref Data::mTrancembrncPressureLimitWindowMaxRejectionReason    |
  * | #46:(U32) | \ref Data::mTrancembrncPressureLimitWindowDefRejectionReason    |
- * | #47:(F32) | \ref Data::mUltrafiltrationVolumeMinRejectionReason             |
- * | #48:(F32) | \ref Data::mUltrafiltrationVolumeMaxRejectionReason             |
- * | #49:(F32) | \ref Data::mUltrafiltrationVolumeDefRejectionReason             |
+ * | #47:(U32) | \ref Data::mUltrafiltrationVolumeMinRejectionReason             |
+ * | #48:(U32) | \ref Data::mUltrafiltrationVolumeMaxRejectionReason             |
+ * | #49:(U32) | \ref Data::mUltrafiltrationVolumeDefRejectionReason             |
  * | #50:(U32) | \ref Data::mVitalsIntervalDefRejectionReason                    |
  * | #51:(U32) | \ref Data::mRinsebackVolumeMinRejectionReason                   |
  * | #52:(U32) | \ref Data::mRinsebackVolumeMaxRejectionReason                   |
  * | #53:(U32) | \ref Data::mRinsebackVolumeDefRejectionReason                   |
  * | #54:(U32) | \ref Data::mRinsebackFlowRateMinRejectionReason                 |
  * | #55:(U32) | \ref Data::mRinsebackFlowRateMaxRejectionReason                 |
  * | #56:(U32) | \ref Data::mRinsebackFlowRateDefRejectionReason                 |
- * | #57:(F32) | \ref Data::mSubstitutionVolumeMinRejectionReason                |
- * | #58:(F32) | \ref Data::mSubstitutionVolumeMaxRejectionReason                |
- * | #59:(F32) | \ref Data::mSubstitutionVolumeDefRejectionReason                |
+ * | #57:(U32) | \ref Data::mSubstitutionVolumeMinRejectionReason                |
+ * | #58:(U32) | \ref Data::mSubstitutionVolumeMaxRejectionReason                |
+ * | #59:(U32) | \ref Data::mSubstitutionVolumeDefRejectionReason                |
  *
  * \sa Data
  *