Handle marker icons

backend/server.js

@@ -60,6 +60,7 @@ router.get('/search', async (req, res, next) => {
       });
     }
 
+    const and = [];
     if (rooms) {
       const allRooms = rooms.split(',');
       const or = allRooms.map(val => {
@@ -75,9 +76,7 @@ router.get('/search', async (req, res, next) => {
         };
       });
 
-      query = Object.assign(query, {
-        "$or": or
-      });
+      and.push({ "$or": or });
     }
 
     if (minSize || maxSize) {
@@ -103,8 +102,12 @@ router.get('/search', async (req, res, next) => {
         };
       });
 
+      and.push({ "$or": or });
+    }
+
+    if (and.length > 0) {
       query = Object.assign(query, {
-        "$or": or
+        "$and": and
       });
     }