diff -r b5ae9017194f -r 2da3d3340403 thermferm/server.c
--- a/thermferm/server.c	Mon May 08 20:54:51 2017 +0200
+++ b/thermferm/server.c	Fri May 19 16:34:21 2017 +0200
@@ -2195,7 +2195,7 @@
 				    free(unit->name);
 				}
 				unit->name = xstrcpy(val);
-				unit->mqtt_flag |= (MQTT_FLAG_MODE);
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 
 			    } else if (val && (strcmp(kwd, (char *)"VOLUME") == 0)) {
 				if (sscanf(val, "%f", &fval) == 1) {
@@ -2216,7 +2216,7 @@
 				    device_count(TRUE, unit->air_address);
 				} else
 				    unit->air_address  = NULL;
-				unit->mqtt_flag |= MQTT_FLAG_AIR;
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 
 			    } else if (strcmp(kwd, (char *)"BEER_ADDRESS") == 0) {
 				if (val && unit->beer_address && (strcmp(val, unit->beer_address)))
@@ -2230,7 +2230,7 @@
 				    device_count(TRUE, unit->beer_address);
 				} else
 				    unit->beer_address = NULL;
-				unit->mqtt_flag |= MQTT_FLAG_BEER;
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 
 			    } else if (strcmp(kwd, (char *)"HEATER_ADDRESS") == 0) {
 				if (val && unit->heater_address && (strcmp(val, unit->heater_address)))
@@ -2244,14 +2244,14 @@
 				    device_count(TRUE, unit->heater_address);
 				} else
 				    unit->heater_address = NULL;
-				unit->mqtt_flag |= MQTT_FLAG_HEATER;
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 
 			    } else if (val && (strcmp(kwd, (char *)"HEATER_STATE") == 0)) {
 				if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) {
 				    if (unit->heater_state != ival)
 					syslog(LOG_NOTICE, "Fermenter unit %s heater state %d to %d", unit->uuid, unit->heater_state, ival);
 				    unit->heater_state = ival;
-				    unit->mqtt_flag |= MQTT_FLAG_HEATER;
+				    unit->mqtt_flag |= MQTT_FLAG_DATA;
 				}
 
 			    } else if (val && (strcmp(kwd, (char *)"HEATER_DELAY") == 0)) {
@@ -2273,14 +2273,14 @@
 				    device_count(TRUE, unit->cooler_address);
 				} else
 				    unit->cooler_address = NULL;
-				unit->mqtt_flag |= MQTT_FLAG_COOLER;
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 
 			    } else if (val && (strcmp(kwd, (char *)"COOLER_STATE") == 0)) {
 				if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) {
 				    if (unit->cooler_state != ival)
 					syslog(LOG_NOTICE, "Fermenter unit %s cooler state %d to %d", unit->uuid, unit->cooler_state, ival);
 				    unit->cooler_state = ival;
-				    unit->mqtt_flag |= MQTT_FLAG_COOLER;
+				    unit->mqtt_flag |= MQTT_FLAG_DATA;
 				}
 
 			    } else if (val && (strcmp(kwd, (char *)"COOLER_DELAY") == 0)) {
@@ -2302,14 +2302,14 @@
 				    device_count(TRUE, unit->fan_address);
 				} else
 				    unit->fan_address = NULL;
-				unit->mqtt_flag |= MQTT_FLAG_FAN;
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 			   
 			    } else if (val && (strcmp(kwd, (char *)"FAN_STATE") == 0)) {
 				if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) {
 				    if (unit->fan_state != ival)
 					syslog(LOG_NOTICE, "Fermenter unit %s fan state %d to %d", unit->uuid, unit->fan_state, ival);    
 				    unit->fan_state = ival;
-				    unit->mqtt_flag |= MQTT_FLAG_FAN;
+				    unit->mqtt_flag |= MQTT_FLAG_DATA;
 				}
 			    
 			    } else if (val && (strcmp(kwd, (char *)"FAN_DELAY") == 0)) {
@@ -2331,14 +2331,14 @@
 				    device_count(TRUE, unit->light_address);
 				} else
 				    unit->light_address = NULL;
-				unit->mqtt_flag |= MQTT_FLAG_LIGHT;
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 
 			    } else if (val && (strcmp(kwd, (char *)"LIGHT_STATE") == 0)) {
 				if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) {
 				    if (unit->light_state != ival)
 					syslog(LOG_NOTICE, "Fermenter unit %s light state %d to %d", unit->uuid, unit->light_state, ival);
 				    unit->light_state = ival;
-				    unit->mqtt_flag |= MQTT_FLAG_LIGHT;
+				    unit->mqtt_flag |= MQTT_FLAG_DATA;
 				}
 
 			    } else if (val && (strcmp(kwd, (char *)"LIGHT_DELAY") == 0)) {
@@ -2373,7 +2373,7 @@
 				    device_count(TRUE, unit->psu_address);
 				} else
 				    unit->psu_address = NULL;
-				unit->mqtt_flag |= MQTT_FLAG_PSU;
+				unit->mqtt_flag |= MQTT_FLAG_DATA;
 
 			    } else if (val && (strcmp(kwd, (char *)"MODE") == 0)) {
 				for (i = 0; i < 5; i++) {
@@ -2383,7 +2383,7 @@
 					    initlog(unit->name);
 					syslog(LOG_NOTICE, "Fermenter unit %s mode %s to %s", unit->uuid, UNITMODE[unit->mode], UNITMODE[i]);
 					unit->mode = i;
-					unit->mqtt_flag |= (MQTT_FLAG_MODE | MQTT_FLAG_SP);
+					unit->mqtt_flag |= MQTT_FLAG_DATA;
 					/* Allways turn everything off after a mode change */
 					unit->PID_cool->OutP = unit->PID_heat->OutP = 0.0;
 					unit->PID_cool->Mode = unit->PID_heat->Mode = PID_MODE_NONE;
@@ -2401,8 +2401,7 @@
 					    unit->prof_target_lo = unit->prof_target_hi = 20.0;
 					    unit->prof_fridge_mode = 0;
 					    if (unit->profile) {
-						unit->mqtt_flag |= MQTT_FLAG_PROFILE;
-						unit->mqtt_flag |= MQTT_FLAG_SP;
+						unit->mqtt_flag |= MQTT_FLAG_DATA;
 					    }
 					}
 					break;
@@ -2414,7 +2413,7 @@
 				    if (unit->fridge_set != fval)
 				    	syslog(LOG_NOTICE, "Fermenter unit %s fridge temperature %.1f to %.1f", unit->uuid, unit->fridge_set, fval);
 				    unit->fridge_set = fval;
-				    unit->mqtt_flag |= MQTT_FLAG_SP;
+				    unit->mqtt_flag |= MQTT_FLAG_DATA;
 				}
 
 			    } else if (val && (strcmp(kwd, (char *)"BEER_SET") == 0)) {
@@ -2422,7 +2421,7 @@
 				    if (unit->beer_set != fval)
 				    	syslog(LOG_NOTICE, "Fermenter unit %s beer temperature %.1f to %.1f", unit->uuid, unit->beer_set, fval);
 				    unit->beer_set = fval;
-				    unit->mqtt_flag |= MQTT_FLAG_SP;
+				    unit->mqtt_flag |= MQTT_FLAG_DATA;
 				}
 
 			    } else if (val && (strcmp(kwd, (char *)"PIDC_IMAX") == 0)) {
@@ -2520,7 +2519,7 @@
 				    device_out(unit->cooler_address, unit->cooler_state);
 				    device_out(unit->fan_address, unit->fan_state);
 				    device_out(unit->light_address, unit->light_state);
-				    unit->mqtt_flag |= (MQTT_FLAG_PROFILE | MQTT_FLAG_SP | MQTT_FLAG_HEATER | MQTT_FLAG_COOLER | MQTT_FLAG_FAN);
+				    unit->mqtt_flag |= MQTT_FLAG_DATA;
 				}
 
 			    } else if (val && (strcmp(kwd, (char *)"PROF_STATE") == 0)) {
@@ -2556,7 +2555,7 @@
 									}
 									break;
 					}
-					unit->mqtt_flag |= (MQTT_FLAG_SP | MQTT_FLAG_PROFILE | MQTT_FLAG_PERCENT);
+					unit->mqtt_flag |= MQTT_FLAG_DATA;
 					break;
 				    }
 				}