diff --git a/contrib/html/items/ehp.json b/contrib/html/items/ehp.json
index 846d43ca..f7bb32dc 100644
--- a/contrib/html/items/ehp.json
+++ b/contrib/html/items/ehp.json
@@ -9,10 +9,10 @@
 			"bounds": [-130,108,80,100],
 			"endpoints": [
 				{"name": "Flow", "anchor": [0.25, 0, 0, -1], "label": "Source",
-					"connectWith": ["ehp", "SourceInput", "ehp", "SourceTempInput", "0"]
+					"connectWith": ["ehp", "SourceInput", "ehp", "SourceTempInput", "$temp"]
 				},
 				{"name": "Return", "anchor": [0.75, 0, 0, -1], "target": true, "label": "Source",
-					"connectWith": ["ehp", "SourceOutput", "ehp", "SourceTempOutput", "0"]
+					"connectWith": ["ehp", "SourceOutput", "ehp", "SourceTempOutput", "$temp"]
 				}
 			]
 		},
@@ -24,15 +24,15 @@
 			"image": "valve.svg",
 			"endpoints": [
 				{"name": "Flow", "anchor": "Top", "target": true,
-					"connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "0"]
+					"connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "$temp"]
 				},
 				{"name": "HwcFlow", "anchor": "Right",
 					"connectWith": ["storage", "HwcInput"],
-					"update": {"type": ["hot", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "on"]]}
+					"update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "on"]}
 				},
 				{"name": "HcFlow", "anchor": "Left",
-					"connectWith": ["storage", "HcInput", "ehp", "HcFlowTemp", "0"],
-					"update": {"type": ["cold", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "off"]]}
+					"connectWith": ["storage", "HcInput", "ehp", "HcFlowTemp", "$temp"],
+					"update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "off"]}
 				}
 			],
 			"items": [
@@ -86,7 +86,7 @@
 			"endpoints": [
 				{"name": "HcFlow", "anchor": [1, 0.15, 1, 0]},
 				{"name": "HcInput", "anchor": [0, 0.15, -1, 0], "target": true,
-					"connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "0"]
+					"connectWith": ["ehp", "HcFlow", "ehp", "FlowTemp", "$temp"]
 				},
 				{"name": "HcReturn", "anchor": [1, 0.85, 1, 0], "target": true, "distance": [0,0,0.7]},
 				{"name": "HcOutput", "anchor": [0, 0.85, -1, 0]}
@@ -98,19 +98,19 @@
 		}
 	],
 	"endpoints": [
-		{"name": "SourceOutput", "anchor": [0.12, 0, 0, -1], "label": "Source", "update":
-			{"type": ["cold", "off"], "condition": ["ehp", "Source", "on"]}
+		{"name": "SourceOutput", "anchor": [0.12, 0, 0, -1], "label": "Source",
+			"update": {"type": ["cold", "off"], "condition": ["ehp", "Source", "on"]}
 		},
-		{"name": "SourceInput", "anchor": [0.22, 0, 0, -1], "target": true, "label": "Source", "distance": [0,60], "update":
-			{"type": ["hot", "off"], "condition": ["ehp", "Source", "on"]}
+		{"name": "SourceInput", "anchor": [0.22, 0, 0, -1], "target": true, "label": "Source", "distance": [0,60],
+			"update": {"type": ["hot", "off"], "condition": ["ehp", "Source", "on"]}
 		},
 		{"name": "HwcReturn", "anchor": [0.53, 0, 0, -1], "target": true, "distance": [0,80,0.3],
 			"connectWith": ["storage", "HwcOutput"],
-			"update": {"type": ["hot", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "on"]]}
+			"update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "on"]}
 		},
 		{"name": "HcReturn", "anchor": [0.78, 0, 0, -1], "target": true, "distance": [0,60,0.42],
-			"connectWith": ["storage", "HcOutput", "ehp", "HcReturnTemp", "0"],
-			"update": {"type": ["cold", "off"], "condition": [["ehp", "Hc1Pump", "on"], ["ehp", "HwcHcValve", "off"]]}
+			"connectWith": ["storage", "HcOutput", "ehp", "HcReturnTemp", "$temp"],
+			"update": {"type": ["cold", "off"], "condition": ["ehp", "Hc1Pump", "on", "ehp", "HwcHcValve", "off"]}
 		},
 		{"name": "HcFlow", "anchor": [0.88, 0, 0, -1], "priority": 1,
 			"update": {"type": ["hot", "off"], "condition": ["ehp", "Hc1Pump", "on"]}
diff --git a/contrib/html/items/mc.4.json b/contrib/html/items/mc.4.json
index 1e72a77f..065c40e1 100644
--- a/contrib/html/items/mc.4.json
+++ b/contrib/html/items/mc.4.json
@@ -5,8 +5,10 @@
 	"endpoints": [
 		{"name":"Flow", "anchor": [0, 0.82, -1, 0], "target": true, "distance": [0,0,0.7], "connectWith": [null, "HcFlow"]},
 		{"name":"Return", "anchor": [0, 0.96, -1, 0], "connectWith": [null, "HcReturn"]},
-		{"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true},
-		{"name":"HcReturn", "anchor": [1, 0.96, 1, 0]}
+		{"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true,
+			"update": {"type": ["hot", "off"], "condition": ["mc", "HcPumpPort", "on"]}},
+		{"name":"HcReturn", "anchor": [1, 0.96, 1, 0],
+			"update": {"type": ["cold", "off"], "condition": ["mc", "HcPumpPort", "on"]}}
 	],
 	"items": [
 		{"name": "Status", "format": "$2", "top": 0.04, "left": 0.04},
diff --git a/contrib/html/items/mc.json b/contrib/html/items/mc.json
index 29ab4cee..7fd68707 100644
--- a/contrib/html/items/mc.json
+++ b/contrib/html/items/mc.json
@@ -5,8 +5,10 @@
 	"endpoints": [
 		{"name":"Flow", "anchor": [0, 0.82, -1, 0], "target": true, "distance": [0,0,0.7], "connectWith": [null, "HcFlow"]},
 		{"name":"Return", "anchor": [0, 0.96, -1, 0], "connectWith": [null, "HcReturn"]},
-		{"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true},
-		{"name":"HcReturn", "anchor": [1, 0.96, 1, 0]}
+		{"name":"HcFlow", "anchor": [1, 0.82, 1, 0], "target": true,
+			"update": {"type": ["hot", "off"], "condition": ["ehp", "Hc2Pump", "on"]}},
+		{"name":"HcReturn", "anchor": [1, 0.96, 1, 0],
+			"update": {"type": ["cold", "off"], "condition": ["ehp", "Hc2Pump", "on"]}}
 	],
 	"items": [
 		{"name": "Status", "format": "$2", "top": 0.04, "left": 0.04},