Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/bootstrap/DataHolder.java
===================================================================
--- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/bootstrap/DataHolder.java	(revision 8cef9e57a5e71205951552cc01ae2037e4dcce2d)
+++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/bootstrap/DataHolder.java	(revision a896ace7c911d22f375fdbd162456c43800ad8dd)
@@ -133,5 +133,5 @@
             // Active event
             Event activeEvent = new Event(
-                    "Active Event for " + local.getName(),
+                    "Upcoming Event for " + local.getName(),
                     "Description for active event",
                     EventType.DJ_NIGHT,
Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/EventServiceImpl.java
===================================================================
--- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/EventServiceImpl.java	(revision 8cef9e57a5e71205951552cc01ae2037e4dcce2d)
+++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/EventServiceImpl.java	(revision a896ace7c911d22f375fdbd162456c43800ad8dd)
@@ -69,5 +69,4 @@
     }
 
-
     @Override
     public Event findEventById(Long id) {
Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalServiceImpl.java
===================================================================
--- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalServiceImpl.java	(revision 8cef9e57a5e71205951552cc01ae2037e4dcce2d)
+++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalServiceImpl.java	(revision a896ace7c911d22f375fdbd162456c43800ad8dd)
@@ -24,4 +24,5 @@
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -174,5 +175,8 @@
 
         if (services != null && !services.isEmpty()) {
-            spec = spec.and((root, query, cb) -> root.join("availableServices").in(services));
+            spec = spec.and((root, query, cb) -> {
+                Objects.requireNonNull(query).distinct(true);
+                return root.join("availableServices").in(services);
+            });
         }
 
Index: ReserveNGo-frontend/src/repository/Events.ts
===================================================================
--- ReserveNGo-frontend/src/repository/Events.ts	(revision 8cef9e57a5e71205951552cc01ae2037e4dcce2d)
+++ ReserveNGo-frontend/src/repository/Events.ts	(revision a896ace7c911d22f375fdbd162456c43800ad8dd)
@@ -21,16 +21,13 @@
     size?: number
   }) {
-    return this.httpClient.get('', {
-      queryParams: {
-        localId: params.localId,
-        name: params.name,
-        eventType: params.eventType,
-        eventStatus: params.eventStatus,
-        sortBy: params.sortBy,
-        direction: params.direction,
-        page: params.page ?? 0,
-        size: params.size ?? 10,
-      },
+    const queryParams: any = {}
+
+    Object.entries(params).forEach(([key, value]) => {
+      if (value !== undefined && value !== null) {
+        queryParams[key] = value
+      }
     })
+
+    return this.httpClient.get('', { queryParams })
   }
 }
Index: ReserveNGo-frontend/src/repository/Locale.ts
===================================================================
--- ReserveNGo-frontend/src/repository/Locale.ts	(revision 8cef9e57a5e71205951552cc01ae2037e4dcce2d)
+++ ReserveNGo-frontend/src/repository/Locale.ts	(revision a896ace7c911d22f375fdbd162456c43800ad8dd)
@@ -13,20 +13,21 @@
   getLocals(params: {
     name?: string
+    services?: string[]
+    localType?: string
+    isOpen?: boolean | null
     sortBy?: string
     direction?: string
-    isOpen?: boolean
     page?: number
     size?: number
   }) {
-    return this.httpClient.get('', {
-      queryParams: {
-        name: params.name,
-        sortBy: params.sortBy,
-        direction: params.direction,
-        isOpen: params.isOpen,
-        page: params.page ?? 0,
-        size: params.size ?? 10,
-      },
+    const queryParams: any = {}
+
+    Object.entries(params).forEach(([key, value]) => {
+      if (value !== undefined && value !== null && !(Array.isArray(value) && value.length === 0)) {
+        queryParams[key] = value
+      }
     })
+
+    return this.httpClient.get('', { queryParams })
   }