diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7143707..b4aac41 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,21 +6,11 @@
   <component name="ChangeListManager">
     <list default="true" id="b5202e0c-6ddf-4a56-a13a-e18798c4c7cf" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/account/account_records.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/account/account_records.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/account/api_events.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/account/api_events.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/account/cluster.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/account/cluster.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/account/function_handlers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/account/function_handlers.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/address/address.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/address/address.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/address/api_events.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/address/api_events.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/address/cluster.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/address/cluster.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/address/function_handlers.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/address/function_handlers.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/events/address/info.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/events/address/info.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/validations/validation/api_events.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/validations/validation/api_events.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/validations/validation/cluster.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/validations/validation/cluster.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/AllEvents/validations/validation/validation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/AllEvents/validations/validation/validation.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Events/Engine/abstract_class.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/Engine/abstract_class.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Events/base_request_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/base_request_model.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Events/Engine/set_defaults/setClusters.py" beforeDir="false" afterPath="$PROJECT_DIR$/Events/Engine/set_defaults/setClusters.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/Events/AllEvents/events/account/api_events.py b/Events/AllEvents/events/account/api_events.py
index 6b27663..622d52f 100644
--- a/Events/AllEvents/events/account/api_events.py
+++ b/Events/AllEvents/events/account/api_events.py
@@ -56,7 +56,7 @@ account_insert_super_user_event.endpoint_callable = (
 
 account_update_super_user_event = Event(
     name="account_insert_super_user_event",
-    key="3aa46155-72bc-4370-b4e7-b937b0f9b893",
+    key="204d3b21-1da6-4739-9f45-36492636c770",
     request_validator=AccountRequestValidators.UpdateAccountRecord,
     # response_validator=SelectResponseAccount,
     # language_models=[AccountRecords.__language_model__],
diff --git a/Events/AllEvents/events/address/api_events.py b/Events/AllEvents/events/address/api_events.py
index 2fafdbd..6e1632f 100644
--- a/Events/AllEvents/events/address/api_events.py
+++ b/Events/AllEvents/events/address/api_events.py
@@ -45,7 +45,7 @@ address_create_super_user_event.endpoint_callable = (
 # Address Update for super_user event
 address_update_super_user_event = Event(
     name="account_insert_super_user_event",
-    key="d638a6b2-cf2e-4361-99a4-021183b75ec1",
+    key="455b8bf5-52e4-47fa-9338-102bfcd364e5",
     # request_validator=AccountRequestValidators.ListAccountRecord,
     # response_validator=SelectResponseAccount,
     # language_models=[AccountRecords.__language_model__],
@@ -63,7 +63,7 @@ address_update_super_user_event.endpoint_callable = (
 # Address Update for super_user event
 address_search_super_user_event = Event(
     name="account_insert_super_user_event",
-    key="d638a6b2-cf2e-4361-99a4-021183b75ec1",
+    key="7dd8c122-fae5-4a6d-a439-068312bb4df3",
     # request_validator=AccountRequestValidators.ListAccountRecord,
     # response_validator=SelectResponseAccount,
     # language_models=[AccountRecords.__language_model__],
diff --git a/Events/AllEvents/events/address/cluster.py b/Events/AllEvents/events/address/cluster.py
index db9f8de..473d930 100644
--- a/Events/AllEvents/events/address/cluster.py
+++ b/Events/AllEvents/events/address/cluster.py
@@ -1,10 +1,10 @@
 from Events.Engine.abstract_class import CategoryCluster
 
 from .address import (
-AddressListEventMethods,
-AddressCreateEventMethods,
-AddressUpdateEventMethods,
-AddressSearchEventMethods,
+    AddressListEventMethods,
+    AddressCreateEventMethods,
+    AddressUpdateEventMethods,
+    AddressSearchEventMethods,
 )
 from .info import address_page_info
 
diff --git a/Events/Engine/abstract_class.py b/Events/Engine/abstract_class.py
index fefc73b..f105e8e 100644
--- a/Events/Engine/abstract_class.py
+++ b/Events/Engine/abstract_class.py
@@ -214,6 +214,10 @@ class CategoryCluster:
         self.INCLUDE_IN_SCHEMA = include_in_schema
         self.IS_CLIENT = is_client
 
+    @property
+    def is_clickable(self):
+        return bool(self.SUBCATEGORY)
+
     @property
     def is_client(self):
         return self.IS_CLIENT
diff --git a/Events/Engine/set_defaults/setClusters.py b/Events/Engine/set_defaults/setClusters.py
index 09600ca..da45a64 100644
--- a/Events/Engine/set_defaults/setClusters.py
+++ b/Events/Engine/set_defaults/setClusters.py
@@ -82,7 +82,8 @@ class PrepareEvents(DecoratorModule):
             cluster = cluster_control.category_cluster
             ### Create Redis Parameters
             # [SAVE]REDIS => MENU_FIRST_LAYER	= [ClusterToMethod, ...]
-            self.valid_redis_items.MENU_FIRST_LAYER_VALUE.add(cluster.name)
+            if cluster.is_client:
+                self.valid_redis_items.MENU_FIRST_LAYER_VALUE.add(cluster.name)
             # [SAVE]REDIS => CLUSTER_INDEX = {ClusterToMethod: [MethodEvent, ...], "MethodEvent": "ClusterToMethod"}
             self.valid_redis_items.CLUSTER_INDEX_VALUE.update(
                 cluster.get_redis_cluster_index_value()