diff --git a/service_app/routers/rules/router.py b/service_app/routers/rules/router.py
index 8c0d46d..04e9f40 100644
--- a/service_app/routers/rules/router.py
+++ b/service_app/routers/rules/router.py
@@ -73,7 +73,8 @@ def endpoint_restriction_list(request: Request):
 def endpoint_restriction_available(request: Request, data: CheckEndpointAccess):
     token_dict, records = parse_token_object_to_dict(request=request), []
     endpoint = EndpointRestriction.filter_one(
-        EndpointRestriction.endpoint_name.ilike(f"%{str(data.endpoint)}%")
+        EndpointRestriction.endpoint_name.ilike(f"%{data.endpoint}%"),
+        system=True,
     ).data
     if not endpoint:
         EndpointRestriction.raise_http_exception(
@@ -82,7 +83,7 @@ def endpoint_restriction_available(request: Request, data: CheckEndpointAccess):
             message="Only Occupant can see this data",
             data={},
         )
-    event = Events.filter_one(Events.id == endpoint.id).data
+    event = Events.filter_one(Events.endpoint_id == endpoint.id).data
     service = Service2Events.filter_one(
         Service2Events.event_id == event.id,
     ).data