diff --git a/libguh/types/param.cpp b/libguh/types/param.cpp
index a6193172..3e8fd109 100644
--- a/libguh/types/param.cpp
+++ b/libguh/types/param.cpp
@@ -98,9 +98,3 @@ void ParamList::setParamValue(const QString &paramName, const QVariant &value)
         }
     }
 }
-
-ParamList ParamList::operator<<(const Param &param)
-{
-    this->append(param);
-    return *this;
-}
diff --git a/libguh/types/param.h b/libguh/types/param.h
index cef17eb2..74b05d18 100644
--- a/libguh/types/param.h
+++ b/libguh/types/param.h
@@ -53,4 +53,12 @@ public:
 };
 QDebug operator<<(QDebug dbg, const ParamList &params);
 
+class ParamList: public QList<Param>
+{
+public:
+    bool hasParam(const QString &paramName) const;
+    QVariant paramValue(const QString &paramName) const;
+    void setParamValue(const QString &paramName, const QVariant &value);
+};
+
 #endif // PARAM_H
diff --git a/plugins/deviceplugins/mock/devicepluginmock.cpp b/plugins/deviceplugins/mock/devicepluginmock.cpp
index add4d04d..3c372185 100644
--- a/plugins/deviceplugins/mock/devicepluginmock.cpp
+++ b/plugins/deviceplugins/mock/devicepluginmock.cpp
@@ -274,9 +274,7 @@ void DevicePluginMock::startMonitoringAutoDevices()
     DeviceDescriptor mockDescriptor(mockDeviceAutoClassId, "Mock Device (Auto created)");
 
     ParamList params;
-    qsrand(QDateTime::currentMSecsSinceEpoch());
-    int port = 4242 + (qrand() % 1000);
-    Param param("httpport", port);
+    Param param("httpport", 4242);
     params.append(param);
     mockDescriptor.setParams(params);
 
diff --git a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
index 86a92fa1..030a2aa0 100644
--- a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
+++ b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
@@ -425,24 +425,22 @@ QList<DeviceClass> DevicePluginOpenweathermap::supportedDevices() const
 
 QPair<DeviceManager::DeviceError, QString> DevicePluginOpenweathermap::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
 {
-    if(deviceClassId == openweathermapDeviceClassId){
 
-        QString location;
-        foreach (const Param &param, params) {
-            if (param.name() == "location") {
-                location = param.value().toString();
-            }
+    qDebug() << "should discover devices with params:" << params;
+    QString location;
+    foreach (const Param &param, params) {
+        qDebug() << "### got param:" << param;
+        if (param.name() == "location") {
+            location = param.value().toString();
         }
-        qDebug() << "Searching for... " << location;
-        if (location.isEmpty()){
-            m_openweaher->searchAutodetect();
-        }else{
-            m_openweaher->search(location);
-        }
-        return DeviceManager::DeviceErrorAsync;
-    }else{
-        return DeviceManager::DeviceErrorDeviceClassNotFound;
     }
+
+    if (location.isEmpty()){
+        m_openweaher->searchAutodetect();
+        return report(DeviceManager::DeviceErrorAsync);
+    }
+    m_openweaher->search(location);
+    return report(DeviceManager::DeviceErrorAsync);
 }
 
 QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginOpenweathermap::setupDevice(Device *device)