diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 3a92aede..c0061e06 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -21,11 +21,12 @@
   :global CertificateAvailable;
   :global EitherOr;
   :global FetchHuge;
+  :global GetRandom20CharAlNum;
   :global HumanReadableNum;
+  :global IfThenElse;
   :global LogPrint;
   :global LogPrintOnce;
   :global LogPrintVerbose;
-  :global MIN;
   :global ScriptLock;
   :global WaitFullyConnected;
 
@@ -56,19 +57,24 @@
   }
 
   :local ListComment ("managed by " . $ScriptName);
-  :local Maskv4 ({});
-  :for I from=0 to=32 do={
-    :local List ("mask-" . $I);
-    /ip/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("255.255.255.255/" . $I);
-    :local Address [ /ip/firewall/address-list/get [ find where dynamic=yes list=$List ] address ];
-    :set ($Maskv4->$I) [ :toip [ :pick $Address 0 [ :find Address "/" ] ] ];
+  :local GenList ($ScriptName . "-" . [ $GetRandom20CharAlNum ]);
+
+  :for I from=0 to=31 do={
+    /ip/firewall/address-list/add dynamic=yes timeout=30s list=$GenList address=("255.255.255.255/" . $I) comment=$I;
   }
-  :local Maskv6 ({});
-  :for I from=0 to=128 do={
-    :local List ("mask-" . $I);
-    /ipv6/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/" . $I);
-    :local Address [ /ipv6/firewall/address-list/get [ find where dynamic=yes list=$List ] address ];
-    :set ($Maskv4->$I) [ :toip6 [ :pick $Address 0 [ :find Address "/" ] ] ];
+  :local Maskv4 ({ "32"=255.255.255.255; });
+  :foreach AddressList in=[ /ip/firewall/address-list/find where list=$GenList ] do={
+    :local Address [ /ip/firewall/address-list/get $AddressList ];
+    :set ($Maskv4->($Address->"comment")) [ :toip [ :pick ($Address->"address") 0 [ :find ($Address->"address") "/" ] ] ];
+  }
+
+  :for I from=0 to=127 do={
+    /ipv6/firewall/address-list/add dynamic=yes timeout=30s list=$GenList address=("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/" . $I) comment=$I;
+  }
+  :local Maskv6 ({ "128"=ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff; });
+  :foreach AddressList in=[ /ipv6/firewall/address-list/find where list=$GenList ] do={
+    :local Address [ /ipv6/firewall/address-list/get $AddressList ];
+    :set ($Maskv6->($Address->"comment")) [ :toip6 [ :pick ($Address->"address") 0 [ :find ($Address->"address") "/" ] ] ];
   }
 
   :foreach FwListName,FwList in=$FwAddrLists do={
@@ -128,18 +134,25 @@
         :do {
           :local Branch;
           :if ($Address ~ "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?\$") do={
-            :set Address 
+            :local Net $Address;
+            :local Cidr "32";
+            :local Slash [ :find $Address "/" ];
+            :if ([ :typeof $Slash ] = "num") do={
+              :set Net [ :toip [ :pick $Address 0 $Slash ] ]
+              :set Cidr [ :pick $Address ($Slash + 1) [ :len $Address ] ];
+              :set Address [ :tostr (([ :toip $Net ] & ($Maskv4->$Cidr)) . [ $IfThenElse ($Cidr < 32) ("/" . $Cidr) ]) ];
+            }
             :set Branch [ $GetBranch $Address ];
             :set ($IPv4Addresses->$Branch->$Address) $TimeOut;
             :error true;
           }
           :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={
             :local Net $Address;
-            :local Cidr 64;
+            :local Cidr "128";
             :local Slash [ :find $Address "/" ];
             :if ([ :typeof $Slash ] = "num") do={
               :set Net [ :toip6 [ :pick $Address 0 $Slash ] ]
-              :set Cidr [ $MIN [ :pick $Address ($Slash + 1) [ :len $Address ] ] 64 ];
+              :set Cidr [ :pick $Address ($Slash + 1) [ :len $Address ] ];
             }
             :set Address (([ :toip6 $Net ] & ($Maskv6->$Cidr)) . "/" . $Cidr);
             :set Branch [ $GetBranch $Address ];