diff --git a/device.c b/device.c
index e21b2b2..6e6e703 100644
--- a/device.c
+++ b/device.c
@@ -326,7 +326,7 @@ bool cSatipDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
      cString address;
      cSatipServer *server = cSatipDiscover::GetInstance()->GetServer(channelP->Source(), channelP->Transponder(), dtp.System());
      if (!server) {
-        debug1("%s No suitable server found [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
+        debug9("%s No suitable server found [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
         return false;
         }
      cSatipDiscover::GetInstance()->SetTransponder(server, channelP->Transponder());
diff --git a/server.c b/server.c
index 7810127..a669904 100644
--- a/server.c
+++ b/server.c
@@ -52,40 +52,34 @@ cSatipServer::cSatipServer(const char *addressP, const char *modelP, const char
   char *s, *p = strdup(*modelM);
   char *r = strtok_r(p, ",", &s);
   while (r) {
-        if (strstr(r, "DVBS2")) {
-           modelTypeM |= cSatipServer::eSatipModelTypeDVBS2;
+        if (strstr(r, "DVBS2-")) {
+           modelTypeM |= eSatipModelTypeDVBS2;
            if (char *c = strstr(r, "-"))
               modelCountM[eSatipModuleDVBS2] = atoi(++c);
-           else
-              modelCountM[eSatipModuleDVBS2] = 1;
            }
-        if (strstr(r, "DVBT2")) {
-           modelTypeM |= cSatipServer::eSatipModelTypeDVBT2;
+        else if (strstr(r, "DVBT2-")) {
+           modelTypeM |= eSatipModelTypeDVBT2;
            if (char *c = strstr(r, "-"))
               modelCountM[eSatipModuleDVBT2] = atoi(++c);
-           else
-              modelCountM[eSatipModuleDVBT2] = 1;
+           modelTypeM |= eSatipModelTypeDVBT;
+           modelCountM[eSatipModuleDVBT] = modelCountM[eSatipModuleDVBT2];
            }
-        if (strstr(r, "DVBT")) {
-           modelTypeM |= cSatipServer::eSatipModelTypeDVBT;
+        else if (strstr(r, "DVBT-")) {
+           modelTypeM |= eSatipModelTypeDVBT;
            if (char *c = strstr(r, "-"))
               modelCountM[eSatipModuleDVBT] = atoi(++c);
-           else
-              modelCountM[eSatipModuleDVBT] = 1;
            }
-        if (strstr(r, "DVBC2")) {
-           modelTypeM |= cSatipServer::eSatipModelTypeDVBC2;
+        else if (strstr(r, "DVBC2-")) {
+           modelTypeM |= eSatipModelTypeDVBC2;
            if (char *c = strstr(r, "-"))
               modelCountM[eSatipModuleDVBC2] = atoi(++c);
-           else
-              modelCountM[eSatipModuleDVBC2] = 1;
+           modelTypeM |= eSatipModelTypeDVBC;
+           modelCountM[eSatipModuleDVBC] = modelCountM[eSatipModuleDVBC2];
            }
-        if (strstr(r, "DVBC")) {
-           modelTypeM |= cSatipServer::eSatipModelTypeDVBC;
+        else if (strstr(r, "DVBC-")) {
+           modelTypeM |= eSatipModelTypeDVBC;
            if (char *c = strstr(r, "-"))
               modelCountM[eSatipModuleDVBC] = atoi(++c);
-           else
-              modelCountM[eSatipModuleDVBC] = 1;
            }
         r = strtok_r(NULL, ",", &s);
         }