diff --git a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml
index fc602df4c..2c582e5df 100644
--- a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/thing/thing-types.xml
@@ -430,9 +430,6 @@
 		<item-type>String</item-type>
 		<label>Mode</label>
 		<description>Thermostat Mode Setting</description>
-		<tags>
-			<tag>heating</tag>
-		</tags>
 		<state pattern="%s" readOnly="false">
 			<options>
 				<option value="AUTOMATIC">AUTOMATIC</option>
@@ -449,7 +446,8 @@
 		<description>Current measured room temperature</description>
 		<category>Temperature</category>
 		<tags>
-			<tag>heating</tag>
+			<tag>Measurement</tag>
+			<tag>Temperature</tag>
 		</tags>
 		<state pattern="%.1f %unit%" readOnly="true"/>
 	</channel-type>
@@ -460,7 +458,8 @@
 		<description>Thermostat Setpoint temperature</description>
 		<category>Temperature</category>
 		<tags>
-			<tag>heating</tag>
+			<tag>Setpoint</tag>
+			<tag>Temperature</tag>
 		</tags>
 		<state min="4.5" max="30.5" step="0.5" pattern="%.1f %unit%"/>
 	</channel-type>