diff --git a/custom_components/mikrotik_router/mikrotik_controller.py b/custom_components/mikrotik_router/mikrotik_controller.py
index 46e6b70..c187d91 100644
--- a/custom_components/mikrotik_router/mikrotik_controller.py
+++ b/custom_components/mikrotik_router/mikrotik_controller.py
@@ -928,6 +928,8 @@ class MikrotikControllerData:
                 {"name": "src-port", "default": "any"},
                 {"name": "dst-address", "default": "any"},
                 {"name": "dst-port", "default": "any"},
+                {"name": "src-address-list", "default": "any"},
+                {"name": "dst-address-list", "default": "any"},
                 {
                     "name": "enabled",
                     "source": "disabled",
@@ -952,6 +954,12 @@ class MikrotikControllerData:
                     {"key": "dst-address"},
                     {"text": ":"},
                     {"key": "dst-port"},
+                    {"text": ","},
+                    {"key": "src-address-list"},
+                    {"text": ":"},
+                    {"key": "dst-address-list"},
+
+
                 ],
                 [
                     {"name": "name"},
@@ -966,6 +974,7 @@ class MikrotikControllerData:
             skip=[
                 {"name": "dynamic", "value": True},
                 {"name": "action", "value": "jump"},
+                {"name": "comment", "value": ""},
             ],
         )
 
diff --git a/custom_components/mikrotik_router/switch.py b/custom_components/mikrotik_router/switch.py
index fb7c877..d53b313 100644
--- a/custom_components/mikrotik_router/switch.py
+++ b/custom_components/mikrotik_router/switch.py
@@ -578,7 +578,8 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
             if self._ctrl.data["mangle"][uid]["uniq-id"] == (
                 f"{self._data['chain']},{self._data['action']},{self._data['protocol']},"
                 f"{self._data['src-address']}:{self._data['src-port']}-"
-                f"{self._data['dst-address']}:{self._data['dst-port']}"
+                f"{self._data['dst-address']}:{self._data['dst-port']},"
+                f"{self._data['src-address-list']}:{self._data['dst-address-list']}"
             ):
                 value = self._ctrl.data["mangle"][uid][".id"]
 
@@ -596,7 +597,8 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
             if self._ctrl.data["mangle"][uid]["uniq-id"] == (
                 f"{self._data['chain']},{self._data['action']},{self._data['protocol']},"
                 f"{self._data['src-address']}:{self._data['src-port']}-"
-                f"{self._data['dst-address']}:{self._data['dst-port']}"
+                f"{self._data['dst-address']}:{self._data['dst-port']},"
+                f"{self._data['src-address-list']}:{self._data['dst-address-list']}"
             ):
                 value = self._ctrl.data["mangle"][uid][".id"]