diff --git a/BridgeEmulator/HueObjects/__init__.py b/BridgeEmulator/HueObjects/__init__.py
index da4d03cd6..5c5e12fa8 100644
--- a/BridgeEmulator/HueObjects/__init__.py
+++ b/BridgeEmulator/HueObjects/__init__.py
@@ -1834,7 +1834,7 @@ def getDevice(self):
                     "rtype": "temperature"
                 }]
             result["type"] = "device"
-        elif self.modelid == "RWL022":
+        elif self.modelid == "RWL022" or self.modelid == "RWL021" or self.modelid == "RWL020":
             result = {"id": self.id_v2, "id_v1": "/sensors/" + self.id_v1, "type": "device"}
             result["product_data"] = {"model_id": self.modelid,
                 "manufacturer_name": "Signify Netherlands B.V.",
@@ -1909,7 +1909,7 @@ def getZigBee(self):
         return result
     def getButtons(self):
         result = []
-        if self.modelid == "RWL022":
+        if self.modelid == "RWL022" or self.modelid == "RWL021" or self.modelid == "RWL020":
             for button in range(4):
                 result.append({
                 "id": str(uuid.uuid5(uuid.NAMESPACE_URL, self.id_v2 + 'button' + str(button + 1))),
diff --git a/BridgeEmulator/flaskUI/v2restapi.py b/BridgeEmulator/flaskUI/v2restapi.py
index b41d90508..22e4d088a 100644
--- a/BridgeEmulator/flaskUI/v2restapi.py
+++ b/BridgeEmulator/flaskUI/v2restapi.py
@@ -366,7 +366,7 @@ def get(self, resource):
                 buttons = sensor.getButtons()
                 if len(buttons) != 0:
                     for button in buttons:
-                        data.append(button)
+                        response["data"].append(button)
         else:
             response["errors"].append({"description": "Not Found"})
             del response["data"]