diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index 6f8d6b6c5..17f604c48 100644
--- a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2020.02.1960
-### Updated: Thu Feb  6 22:41:58 SAST 2020
+### Version: V3.2020.02.1962
+### Updated: Thu Feb  6 23:44:33 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
index 5e7c0ed8e..465ec1626 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	1;
+35.188.1.99	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index 3e60bde86..290c48e19 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	0;
+35.188.1.99	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
index 6f8d6b6c5..17f604c48 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2020.02.1960
-### Updated: Thu Feb  6 22:41:58 SAST 2020
+### Version: V3.2020.02.1962
+### Updated: Thu Feb  6 23:44:33 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
index 5e7c0ed8e..465ec1626 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	1;
+35.188.1.99	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index 3e60bde86..290c48e19 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	0;
+35.188.1.99	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
index 6f8d6b6c5..17f604c48 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2020.02.1960
-### Updated: Thu Feb  6 22:41:58 SAST 2020
+### Version: V3.2020.02.1962
+### Updated: Thu Feb  6 23:44:33 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
index 5e7c0ed8e..465ec1626 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	1;
+35.188.1.99	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
index 3e60bde86..290c48e19 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	0;
+35.188.1.99	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
index 6f8d6b6c5..17f604c48 100644
--- a/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2020.02.1960
-### Updated: Thu Feb  6 22:41:58 SAST 2020
+### Version: V3.2020.02.1962
+### Updated: Thu Feb  6 23:44:33 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index 6f8d6b6c5..17f604c48 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2020.02.1960
-### Updated: Thu Feb  6 22:41:58 SAST 2020
+### Version: V3.2020.02.1962
+### Updated: Thu Feb  6 23:44:33 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index 1425d237e..48cd9abb5 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
index deb2992bb..609536562 100644
--- a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +45,4 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.202.145.110          0;
+35.193.7.13             0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100644
--- a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
index 90fe4f9d3..479de1217 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	1;
+35.192.85.2	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index bc389ee32..d9f0a2c04 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	0;
+35.192.85.2	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
index 90fe4f9d3..479de1217 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	1;
+35.192.85.2	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index bc389ee32..d9f0a2c04 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	0;
+35.192.85.2	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
index 90fe4f9d3..479de1217 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	1;
+35.192.85.2	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
index bc389ee32..d9f0a2c04 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	0;
+35.192.85.2	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100644
--- a/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
index 1064de76f..967f10e63 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.184.226.236          0;
-35.192.85.2             0;
+35.193.7.13             0;
+35.188.1.99             0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index c1e1e0627..c31b93551 100644
--- a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
index 4819797c6..923ef57a3 100644
--- a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.224.112.202          0;
 35.222.7.205            0;
+35.184.226.236          0;
diff --git a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
index 9a2fe9649..56266307a 100644
--- a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
index 5bfb5e340..3f4521ad1 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.188.1.99             0;
+104.154.120.187         0;
+35.222.7.205            0;
 35.224.112.202          0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100644
--- a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
index 4819797c6..a3960a860 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
+35.188.1.99             0;
+35.193.7.13             0;
 35.224.112.202          0;
-35.222.7.205            0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100644
--- a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 5e7c0ed8e..465ec1626 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	1;
+35.188.1.99	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test_units/random-bots-for-test-quick.list b/.dev-tools/test_units/random-bots-for-test-quick.list
index 814058487..0be23a381 100644
--- a/.dev-tools/test_units/random-bots-for-test-quick.list
+++ b/.dev-tools/test_units/random-bots-for-test-quick.list
@@ -1,10 +1,10 @@
-Grabber
-Kozmosbot
-Likse
-LNSpiderguy
-Quick-Crawler
-RedesScrapy
-The Intraformant
-TightTwatBot
-WWW-Mechanize
-zauba.io
+arquivo.pt
+Buddy
+DatabaseDriverMysqli
+Fyrebot
+IRLbot
+Netcraft
+NICErsPRO
+Picscout
+SBIder
+Sociscraper
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index 85e6592f7..715585bdf 100644
--- a/.dev-tools/test_units/random-bots-for-test.list
+++ b/.dev-tools/test_units/random-bots-for-test.list
@@ -1,250 +1,250 @@
-360Spider
 404enemy
 Abonti
-AhrefsBot
-AiHitBot
-Alexibot
+Aipbot
+AllSubmitter
 Anarchie
 Apexoo
-archive.org_bot
-autoemailspider
-AwarioSmartBot
-BackDoorBot
-Backlink-Ceck
-backlink-check
+arquivo-web-crawler
+Asterias
+AwarioRssBot
 BacklinkCrawler
-BackStreet
 BackWeb
-Barkrowler
-BatchFTP
+Badass
 BBBike
 BDFetch
 BetaBot
+Bigfoot
 Bitacle
 BLEXBot
-Blow
 BlowFish
+Boardreader
 Bolt
-BotALot
 Brandprotect
 Brandwatch
 Buddy
-BunnySlippers
-BuzzSumo
-CCBot
+BuiltBotTough
+Bullseye
+CazoodleBot
 Cegbfeieh
+CheeseBot
 CherryPicker
-ChinaClaw
-Chlooe
-Cliqzbot
-com.plumanalytics
-Copyscape
-Cosmos
-crawl.sogou.com
+cognitiveseo
+Copier
+CopyRightCheck
+Craftbot
+crawler4j
+crawler.feedback
 CrazyWebCrawler
 CSHttp
-Curious
-Custo
-DataCha0s
-DBLBot
+DatabaseDriverMysqli
 Demon
-Digincore
 Discobot
 Dispatch
+DnyzBot
+DomainAppender
+DomainCrawler
 DomainSigmaCrawler
-DomainStatsBot
-Dotbot
-Download Wonder
 Dragonfly
+Drip
 DSearch
+DTS Agent
 EasyDL
-Ebingbong
-ECCP/1.0
+EMail Siphon
 EMail Wolf
+EroCrawler
 Evil
 Exabot
-ExtLinksBot
+Express WebPictures
 Extreme Picture Finder
-facebookscraper
-FDM
-FemtosearchBot
+EyeNetIE
 FHscan
-FlashGet
-Foobot
-Freeuploader
-FyberSpider
 GalaxyBot
 Genieo
-Gigablast
-Gigabot
-G-i-g-a-b-o-t
+GermCrawler
+Getintent
+GetRight
+GetWeb
 Go-Ahead-Got-It
+Gotit
 GoZilla
 Go!Zilla
-Grabber
-Grafula
 GrapeshotCrawler
-GT::WWW
-HaosouSpider
 Harvest
 Havij
 HEADMasterSEO
-Heritrix
-IDBot
-Id-search
-Image Fetch
-Internet Ninja
+HTTP::Lite
+HTTrack
+Humanlinks
+HybridBot
+Iblog
+IndeedBot
+Indy Library
+InfoTekies
+InterGET
+InternetSeer
+internetVista monitor
 ips-agent
-Iria
-JamesBOT
-JennyBot
+Iskanie
+IstellaBot
+Jbrofuzz
 JetCar
-JustView
-Kenjin Spider
-Keyword Density
-Kozmosbot
+Jetty
+JOC Web Spider
+Joomla
+Jorgee
 LeechFTP
 LeechGet
 LexiBot
-Likse
-Linkdexbot
-LinkScan
+Lftp
+LinkpadBot
 LinqiaRSSBot
-Lipperhey
+Lipperhey Spider
 Litemage_walker
-LWP::Simple
-Mag-Net
-magpie-crawler
+Lmspider
+LNSpiderguy
+Ltx71
 Mail.RU_Bot
-Majestic SEO
-Masscan
+Majestic12
+MarkMonitor
 Mass Downloader
-MeanPath Bot
-MFC_Tear_Sample
-Microsoft URL Control
-Mister PiX
-Mojeek
+Mata Hari
+MauiBot
+Meanpathbot
+Mediatoolkitbot
+MegaIndex.ru
+Metauri
+Microsoft Data Access
+MIDown tool
+MIIxpc
+MJ12bot
+Mojolicious
 Morfeus Fucking Scanner
+Mr.4x3
 MSFrontPage
-Musobot
-Name Intelligence
+MSIECrawler
+Msrabot
+Nameprotect
+Navroad
+NearSite
+NetAnts
 Netcraft
-netEstate NE Crawler
-NetLyzer
-Netvibes
+Net Vampire
+NetZIP
 NextGenSearchBot
-Niki-bot
+Nibbler
 Nikto
-Ninja
-Nmap
+Nimbostratus
 NPbot
-Nutch
-Octopus
-OnCrawl
+oBot
+Offline Navigator
 OpenLinkProfiler
-Openvas
+PageGrabber
 PageScorer
-pcBrowser
+Papa Foto
 PeoplePal
-Picscout
+Picsearch
 PictureFinder
-Pimonster
 PleaseCrawl
+plumanalytics
 POE-Component-Client-HTTP
-Probethenet
-ProPowerBot
-Psbot
-PxBroker
+ProWebWalker
 PyCurl
-QueryN Metasearch
-RankActiveLinkBot
 RankFlex
-RankingBot
-RankingBot2
-RankurBot
-Reaper
-RebelMouse
-Recorder
+Rankivabot
+RealDownload
+RocketCrawler
 Rogerbot
-SalesIntelligent
-ScanAlert
-scan.lol
-ScoutJet
+SBIder
+Scanbot
 Scrapy
-SearchmetricsBot
+Searchestate
 Semrush
 SEOkicks
+SEOkicks-Robot
+SEOlyticsCrawler
 Seomoz
 SEOprofiler
-seoscanners
-SEOstats
+SeoSiteCheckup
 sexsearcher
-Siphon
-SiteExplorer
+SISTRIX
+Sitebeam
 SiteLockSpider
 SiteSnagger
+Sitevigil
 SmartDownload
 Snapbot
+Sociscraper
 Sogou web spider
+Sosospider
+SpaceBison
 Spammen
 SpankBot
 Spanner
-sp_auditbot
+Spinn3r
 SputnikBot
 Sqlmap
 Sqlworm
 Sqworm
-Steeler
-Sucker
+SuperHTTP
 Surfbot
 SurveyBot
-Suzuran
+Swiftbot
+sysscan
 Szukacz
 T0PHackTeam
 T8Abot
+Telesoft
 Telesphoreo
 Telesphorep
-TheNomad
+The Intraformant
 TightTwatBot
 Titan
 Toata
-Toweyabot
 Tracemyfile
-Trendiction
 trendiction.de
-True_Robot
-TwengaBot
-Twice
+Turingos
+Turnitin
+TurnitinBot
 Typhoeus
+UnisterBot
+Upflow
 URLy Warning
-VB Project
-VeriCiteCrawler
+URLy.Warning
+Vacuum
+Virusdie
 VoidEYE
-Voltron
-WallpapersHD
+Wallpapers/3.0
+WASALive-Bot
+WBSearchBot
 Webalta
+Web Auto
+WebBandit
+WebCollage
 WEBDAV
+WebEnhancer
+Web Enhancer
 WebFetch
 Web Fetch
+WebFuck
+Web Fuck
 WebLeacher
-WebPix
 WebSauger
-Webshag
-WebsiteQuester
 Website Quester
-WebStripper
-Web Sucker
+Webster
+WebWhacker
+WebZIP
 Who.is Bot
 WinHTTrack
-WISENutbot
-Wonderbot
+WiseGuys Robot
+Woobot
+Wotbox
 Wprecon
-WWW-Collector-E
-WWW-Mechanize
-WWWOFFLE
+WPScan
+WWW::Mechanize
 x09Mozilla
+xpymep1.exe
 YoudaoBot
-Zeus
-zgrab
-Zitebot
+Zauba
+zauba.io
 ZmEu
+ZumBot
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index 8dca058de..918b6a137 100644
--- a/.dev-tools/test_units/random-bots-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-bots-for-whitelist-test.list
@@ -1,250 +1,250 @@
-360Spider
-404checker
-404enemy
-Abonti
 Aboundex
 Acunetix
-ADmantX
-AfD-Verbotsverfahren
 AhrefsBot
 AiHitBot
-Alexibot
-Alligator
-Anarchie
+AllSubmitter
 Apexoo
 arquivo-web-crawler
 ASPSeek
+Attach
 autoemailspider
+AwarioSmartBot
+BackDoorBot
 backlink-check
+BacklinkCrawler
 BackStreet
-BackWeb
-Badass
-Battleztar Bazinga
+Barkrowler
+BatchFTP
 BBBike
-BDCbot
+BetaBot
 Bigfoot
+Black Hole
 BLEXBot
 Blow
-BlowFish
 Bolt
+Brandprotect
 Buddy
-Bullseye
+BuzzSumo
+Calculon
+CATExplorador
+CazoodleBot
 CCBot
 Cegbfeieh
 CheeseBot
 CherryPicker
-Claritybot
+ChinaClaw
 coccocbot-web
 Cogentbot
-cognitiveseo
 Collector
 com.plumanalytics
 Copier
-CopyRightCheck
+Copyscape
 Cosmos
 Craftbot
 crawl.sogou.com
-DBLBot
+CrunchBot
+Curious
+DatabaseDriverMysqli
+Demon
+Devil
+Digincore
+DigitalPebble
+DIIbot
+Disco
+Discobot
+Discoverybot
 Dispatch
-DnyzBot
+DittoSpyder
+DomainAppender
 DomainSigmaCrawler
-Dragonfly
-Drip
+DSearch
+DTS Agent
 EasyDL
-eCatch
-ECCP/1.0
-Exabot
-Express WebPictures
-Extractor
+Ecxi
+EroCrawler
+evc-batch
+Evil
+ExtractorPro
 Extreme Picture Finder
-FDM
 FHscan
-Fimap
-Foobot
-FrontPage
-GermCrawler
-Getintent
-GetWeb
-Gigablast
-Gigabot
-Go-Ahead-Got-It
+Flunky
+Genieo
+GoZilla
 GrabNet
+Grafula
 GrapeshotCrawler
-GT::WWW
-Havij
-HEADMasterSEO
+Haansoft
+HaosouSpider
+Harvest
 heritrix
 Heritrix
 Hloader
 HMView
-Id-search
-Image Sucker
+HTTP::Lite
+HTTrack
+Humanlinks
+Iblog
+IDBot
+Image Fetch
 IndeedBot
 Indy Library
+InfoNaviRobot
 Intelliseek
+InterGET
 Internet Ninja
-internetVista monitor
+InternetSeer
+Iria
+IRLbot
+JamesBOT
 Jbrofuzz
-JennyBot
-Jetty
 JikeSpider
+JOC Web Spider
 Jorgee
 Jyxobot
-Kenjin Spider
-Keyword Density
-LeechFTP
-LeechGet
+Kozmosbot
+Larbin
 LexiBot
+Lftp
+LibWeb
 Lightspeedsystems
+Likse
 Linkdexbot
+LinkpadBot
+LinksManager
 LinkWalker
-LinqiaMetadataDownloaderBot
+LinqiaScrapeBot
 Lipperhey
 Litemage_walker
-Lmspider
+Ltx71
 LWP::Simple
-Mag-Net
+lwp-trivial
+Mail.RU_Bot
+Majestic12
 Majestic SEO
+Majestic-SEO
 MarkMonitor
-Mass Downloader
-Meanpathbot
-Mediatoolkitbot
+Mata Hari
+meanpathbot
+MeanPath Bot
 mediawords
-MIDown tool
-MIIxpc
+MegaIndex.ru
+Metauri
 MJ12bot
-Mojeek
 Mojolicious
+Morfeus Fucking Scanner
+Mr.4x3
 MSFrontPage
 MSIECrawler
-Msrabot
 muhstik-scan
+Musobot
 Navroad
+Needle
 Netcraft
-netEstate NE Crawler
-NetSpider
+Net Vampire
 Netvibes
 NextGenSearchBot
-Nibbler
-NICErsPRO
 Niki-bot
-NimbleCrawler
+Nimbostratus
+NPbot
 oBot
-Offline Explorer
+Octopus
 Offline Navigator
-OnCrawl
-OpenLinkProfiler
-OpenVAS
+Openfind
+Openvas
 OrangeSpider
-OutclicksBot
-page scorer
-Papa Foto
-PECL::HTTP
+OutfoxBot
+Page Analyzer
+Pandalytics
+Panscient
+PHPCrawl
 PleaseCrawl
-plumanalytics
-Probethenet
-ProWebWalker
+ProPowerBot
+Psbot
+PxBroker
+PyCurl
 QueryN Metasearch
-RankurBot
-RebelMouse
-Recorder
+Quick-Crawler
+RankActive
+RankActiveLinkBot
+RankFlex
+RealDownload
+Reaper
 RedesScrapy
-ReGet
-RepoMonkey
-RocketCrawler
-Rogerbot
+s1z.ru
 ScanAlert
 Scanbot
-Scrapy
+scan.lol
 Screaming
 ScreenerBot
 Searchestate
+SearchmetricsBot
+Semrush
 SEOkicks
 SEOlyticsCrawler
-Seomoz
+SEOprofiler
 seoscanners
 SeoSiteCheckup
+SEOstats
 sexsearcher
-Shodan
-Siteimprove
+SISTRIX
+Sitebeam
+SiteExplorer
+SiteLockSpider
+SiteSnagger
 Site Sucker
-SmartDownload
+SlySearch
 SMTBot
-Snoopy
-SocialRankIOBot
-sogouspider
+Snake
+Snapbot
+Sociscraper
 Sogou web spider
-Sottopop
-SpaceBison
-SpankBot
-Spanner
-sp_auditbot
-SputnikBot
-Sqworm
+Spammen
+Spbot
 Stripper
-Sucuri
+SuperBot
 SuperHTTP
 Suzuran
-Szukacz
-tAkeOut
-Teleport
-TeleportPro
-Telesoft
-Telesphorep
+Swiftbot
+sysscan
+The Intraformant
+TheNomad
+Thumbor
 TightTwatBot
-Titan
-Tracemyfile
-Trendiction
-Trendictionbot
-trendiction.com
-True_Robot
+Toweyabot
+trendiction.de
 Turingos
 TwengaBot
-Twice
-Upflow
+Typhoeus
+Vacuum
 Vagabondo
-VB Project
-VeriCiteCrawler
-Virusdie
 Voil
-Voltron
 WallpapersHD
 WASALive-Bot
-WBSearchBot
-Web Auto
 WebBandit
-Web Collage
 WebCopier
-WEBDAV
 Web Enhancer
 WebFetch
 WebFuck
 Web Fuck
-WebGo IS
-WebImageCollector
-WebPix
 Web Pix
-Web Sauger
 Webshag
-WebsiteQuester
+WebsiteExtractor
+Website Quester
+WebStripper
+Web Sucker
 WebWhacker
-WebZIP
-Whatweb
+WeSEE
 Who.is Bot
 WiseGuys Robot
-WISENutbot
 Wonderbot
-WWW-Collector-E
-WWWOFFLE
+Wprecon
+WWW-Mechanize
+WWW::Mechanize
+x22Mozilla
 Xenu
 xpymep1.exe
 YoudaoBot
-Zade
-Zauba
 Zermelo
-Zeus
 zgrab
 Zitebot
-ZmEu
-ZumBot
 ZyBorg
diff --git a/.dev-tools/test_units/random-referrers-for-test-quick.list b/.dev-tools/test_units/random-referrers-for-test-quick.list
index b755c2b74..70f35ff0f 100644
--- a/.dev-tools/test_units/random-referrers-for-test-quick.list
+++ b/.dev-tools/test_units/random-referrers-for-test-quick.list
@@ -1,10 +1,10 @@
-allproblog.com
-bonzbuddy.com
-fiverr.com
-generousdeal-a.akamaihd.net
-greatfind-a.akamaihd.net
-jimmychoosale.online
-pillscheap24h.com
-recinziireale.com
-topanasex.com
-vapomnoncri.tk
+apidiamondatanet-a.akamaihd.net
+bumskontakte.org
+dvervmoskvu.ru
+lollypopgaming.com
+machicon-akihabara.info
+partnerads.men
+resultshub-a.akamaihd.net
+thecoral.com.br
+tizanidineinteractions.blogspot.com
+zarepta.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 9233a5b5d..5649929b4 100644
--- a/.dev-tools/test_units/random-referrers-for-test.list
+++ b/.dev-tools/test_units/random-referrers-for-test.list
@@ -1,500 +1,500 @@
-100dollars-seo.com
-14b.info
-1flag.co.za
-2345.com
-2ads.co.uk
-4inn.ru
-4pp13.com
+01apple.com
+101raccoon.ru
+12bet.com
+12masterov.com
+1kinobig.ru
+1stat.ru
+2015god.org
+24-ak.ru
+2728fb936f0.com
+2daytrendingnews.com
+3-letter-domains.net
 4senses.co
-55wmz.ru
-66cpwgln.space
-883zy.com
-a96527gi.beget.tech
-aanapa.ru
-abovetherivernc.com
-actices.com
-adbetclickin.pink
-adclickthru.net
-adultactioncam.com
-adviceforum.info
-afmuseum.com
-afslankpillen2017nl.eu
-air-edem.ru
-akvamaster.dp.ua
-albumsuper.info
-alert-fdm.xyz
-algerianembassy.co.in
-allbizne.co.ua
-allcredits.su
-alldezservice.kz
-allesohnegirls.net
-ananumous.ru
-angel1777.kz
-angigreene.com
-anticrawler.org
-aosheng-tech.com
-apidiamondatanet-a.akamaihd.net
-app5.letmacworkfaster.world
+4webmasters.com
+76brighton.co.uk
+8lufu.com
+a14download.com
+aab94f698f36684c5a852a2ef272e031bb.com
+aad1f4acb0a373420d9b0c4202d38d94fa.com
+abcdeg.xyz
+adidas.frwebs.fr
+adktrailmap.com
+adloads.com
+adsland.men
+adtech.us
+advancedsoftwaresupport.com
+aerogo.com
+afftrack001.com
+agadelha.com.br
+alert-jdh.xyz
+alevinefesleri.com
+alfabot.xyz
+alif-ba-ta.com
+alltheviews.com
+amazon-seo-service.com
+ameblo.top
+amehdaily.com
+amoi.tn
+am-se.com
+amt-k.ru
+android4fun.org
+apartamentwroclaw.eu
+apessay.com
+apisecretsaucebi-a.akamaihd.net
 approved.su
-ardimobileinfo.ml
-arewater.com
-arquivo.pt
-artparquet.ru
-asia-forum.ru
-asscenihotosidea.blogspot.co.za
-asseenontv.ru
-atlant-auto.info
-aviva-limoux.com
-babosas.com
-baditri.com
-balkanfarma.org
-bankmib.ru
-barbourjackets.online
-bashtime.ru
-bbsoldes.fr
-beremenyashka.com
-bestcurs.org
-besthoro.ru
-bestmobilityscooterstoday.com
-bestmouthwash.club
-bestofupload.info
-bestssaker.com
-big-boards.info
-bigcareer.info
-billiard-classic.com.ua
-bio-japan.net
-bitcoinpile.com
-bitporno.sx
-blackhatworth.com
-blog.axant.it
-blog-hits.com
-boo-arts.com
+aramaicmedia.org
+arclk.net
+arenda-yeisk.ru
+artpicso.com
+asseenontvonline.ru
+astrochicks.com
+atelielembrancaqueencanta.com.br
+audiofree.ru
+autoua.top
+aversis.net
+aviav.co
+avto-oligarh.ru
+ayodhya.co
+bag77.ru
+baixar-musicas-gratis.com
+baladur.ru
+bang-hotties.com
+battlecarnival.su
+beatifullandscape.co
+best-coupon-offer.com
+best-seo-software.xyz
+bet365.com
+bget.ru
+bgviagrachrx.com
+bin-brokers.com
+bizlist.com.de
+blagovest-med.ru
+blockety.co
+blockworld.ru
+blog.f00kclan.de
+blogos.kz
+blogs.rediff.com
+bodybuilding-shop.biz
+braip.com.br
 brandov.ru
-bristolhostel.com
-brus-vsem.ru
-buckspar.gq
-bumble.cheapwebsitehoster.com
-buqayy0.livejournal.com
-business-made-fun.com
+buchananshardware.com
+buehne-fuer-menschenrechte.de
+buigas.00it.com
+bukleteg.xyz
+bumascloset.com
+buttons-for-website.com
 buynorxx.com
-buypanicdisorderpill.com
-bycontext.com
-c1.onedmp.com
-candelluxsklep.pl
-carfax.com.ua
+cakemediahq.com.au
+calstaterealty.us
+canacopegdl.com
+candypeople.se
+canyougethighofftizanidine.blogspot.com
 cars-modification.net
-castingbank.ru
-cb.iphantom.com
-centraletermice.us
-centrdebut.ru
+cartierbraceletsreplica.pw
+cashonads.com
+casinorewards.info
+cayado.snn.gr
+cbcseward.com
+ccjp.eu
+cdn.walkme.com
+cenokos.ru
+centre-indigo.org.ua
 cfacarrosserie74.com
-cfsrating.sonicwall.com
-chatroulette.world
-cheapjerseysap.com
-checkm8.com
-chinese-amezon.com
-cialischsrx.com
-cleanallvirus.com
-cleanersoft.com
-clickaider.com
-clickcash.com
-communisave.co.za
-coolgramgoods.com
-coolwallpapers4k.info
-copypaste.traderzplanet.in
-coslab.club
+cheapcigarettesc.info
+cheapjerseysa.com
+cheapjerseysfootballshop.com
+cheapmoncler.xyz
+cialisovercounteratwalmartusa.com
+cicaki.net
+cjs.com.ru
+clickprotects.com
+cocyq.inwtrade.com
+companies-catalog.com
+compliance-andrew.top
+compliance-barak.xyz
+compliance-checker-7.info
+compliance-checker.info
+compliance-donald.xyz
+compliance-jessica.top
+compliance-viktor.top
+comsysnet.com
+conciergegroup.org
 cosmeticswomens-womensports.rhcloud.com
-counter.yadro.ru
-covetnica.com
-craftinsta.ru
-crest3d.ru
-crynet.cc
-cwetochki.ru
-czat.wp.pl
-dating-app.ru
-dating-time-now.com
-deadlinkchecker.com
-dealighted.com
-digital-sale.su
-dikqlyremy.info
-dimfour.com
-dispo.de
-dktr.ru
+counterbot.com
+crackguru.tk
+csgo4.win
+damedingel.ya.ru
+danceuniverse.ru
+datsun-do.com
+d-black.bz
+dealwifi.com
+deplim.com
+dev-seo.blog
+dfwu1013.info
+dichvuvesinhhanoi.com
+digitalassetmanagement.site
+dipstar.org
+djekxa.ru
 dkvorota.ru
-download-wallpaper.net
-drev.biz
-drpornogratisx.xxx
-drugstoreforyou.com
-druzhininevgeniy63.blogspot.com
-dvr.biz.ua
-easyshoppermac.com
-e-collantes.com
+docs4all.com
+eachdayisagift.review
+earncash.com.ua
 edelstahlschornstein-123.de
-ed-shop01.ru
-edudocs.net
-emerson-rus.ru
-enhand.se
-eonpal.com
-erotikchat-24.com
-escort-russian.com
-escortslet.net
-eshop.md
-essaypro.com
-familienzahnaerzte.com
-fetlifeblog.com
+editors.choice6912650.hulfingtonpost.com
+electronicadirect.com
+elektrischezigarette1.onsugar.com
+elektroniksigaraankara.info
+elektrozigarette2.wordpressy.pl
+elektrozigaretten1.tumblr.com
+elvel.com.ua
+enternet.ee
+erotik-kostenlos.net
+eurosamodelki.ru
+everflora.ru
+ez8motelseaworldsandiego.com
+ezigarettekaufen2.yolasite.com
+facecup.top
+fakehandbags.xyz
+fapgon.com
 fickblock18.com
-fickkontakte.org
-filmfanatic.com
-findpik.com
-firesub.pl
-firstdrugmall.ru
+fickenbumsen.net
+fidelityfunding.com
+fillmewithhappiness.com
 flashlarevista.com
-forminecrafters.ru
-foto-sisek.porngalleries.top
-free-laptop-reward.com
-free-share-buttons.com
-free-today.com
+formseo.com
+forum.poker4life.ru
+foxtechfpv.com
+foxweber.com
+foxydeal.com
+free-deals.faith
+free-fb-traffic.com
+free-social-buttons.com
+free-stock-illustration.com
+friendflnder.com
+fuckbuddybestgilf.info
+fun2cell.net
+fun-mobi.pl
 funnypica.com
-funponsel.com
-g7m.pl
-gael-s.ru
-gallictures.com
-gamedayassist.com
-gay-file.com
-gdzkurokam.ru
-germes-trans.com
-germetiki.com.ua
-glass-msk.ru
-glavprofit.ru
-gogps.me
-goldpanningtools.com
-googlsucks.com
-goosefishpost.bid
-gopixdatabase.com
-gotorussia.com
-grtyi.com
-gsasearchengineranker.space
-guiadeserraazul.com
-gwhwpxbw.bloger.index.hr
-habermetre.com
-handsandlegs.ru
-hatedriveapart.com
-hausfrauensex18.com
+funtoonez.com
+fyl.com.ru
+g33.org
+gameonasia.com
+gardene.ru
+ge0ip.net
+genericviagrasildenafiled.net
+getyourimage.club
+get-your-social-buttons.info
+gfaq.ru
+gheus.altervista.org
+girlsfuckdick.com
+gk-atlant.info
+goodhumor24.com
+gox.com.ua
+greatzip.com
+greendream.com.ua
+gsmlab.pl
+guigyverpo.cf
 hd-filmy.net
-hdseriale.pl
-hdxnxxtube.mobi
+hentaiheroes.com
+histock.info
 hitcpm.com
-hledejvshopech.cz
-hmmm.cz
-hostnow.men
-hotblognetwork.com
-hotshoppymac.com
-hreade.com
+hobild.net
+howmuchdoestizanidinecost.blogspot.com
+hulfingtonpost.com
 humbmosquina.tk
-i-hobot.ru
-ilbe.club
-imitex-plus.ru
-investzalog.ru
-islamtoday.co.za
-ix20.ru
-japfm.com
-javidol.site
-jovencitas.gratis
-justbcause.com
-jwss.cc
+idc.com.ua
+ifirestarter.ru
+imagefinder.site
+imicrovision.com
+impresagaia.it
+indianmedicaltourismshop.com
+infodocsportal.com
+interior-stickers.ru
+internetartfair.com
+invitefashion.com
+iqbazar.ru
+iscblog.info
+istmira.ru
+itsdp3.com
+iusstf.org
+ivanstroi.ru
+iyasimasennka.com
+izismile.com
+javcoast.com
+jetsli.de
+jikoman.info
+job.icivil.ir
+jpcycles.com
+kambasoft.com
 kam-dom.ru
-kinoplen.ru
-klin3952.ru
-kmgamex.cf
-krasnodar.xrus.org
+karting196.ru
+kashubadesign.ru
+keki.info
+kerch.site
+ketoanhanoi.info
+keywordteam.net
+khafre.us
+kinohit1.ru
+klitimg.pw
+kochanelli.com
+krasivoe-hd.com
+kreativperlen.ch
+kung-fu-ru.com
 kunstaktien.info
-kurbappeal.info
-kutikomi.net
-kwzf.net
-languagecode.com
-lapitec.eu
-lennatin.info
+labafydjxa.su
+lacloop.info
+lakomka.com.ua
+laparfumotec.com
+lawyers.cafe
+ledis.top
+letslowbefast.today
 lifehacĸer.com
-lineavabit.it
-lineshops.biz
-lion.conboy.us
+livefixer.com
 liveinternet.ro
-lost-alpha.ru
-lotto6888.com
-louboutinreplica.pw
-lowephotos.info
-lsex.xyz
-lsp-awak-perikanan.com
-lulea-auktionsverk.se
-macdamaged.tech
-macotool.com
-mac-shield.com
-magazintiande.ru
-mahnwachen-helfen.info
-mainhp.net
-mall.uk
-mansiondelrio.co
-mansparskats.com
-manyresultshub-a.akamaihd.net
-mararoom.ru
-marcowebonyodziezowe.pl
-masterseek.com
-medkletki.ru
-medmajor.ru
-meetingrainstorm.bid
-megahdporno.net
-mejoresfotos.eu
-methodsmarketing.com
-microstatic.pl
-mini.7zap.com
-mir-limuzinov.ru
-missis.top
-mncrftpcs.com
-mobilierland.com
-modabutik.ru
-modenamebel.ru
-moetomnenie.com
+live-sexcam.tk
+lmrauction.com
+locustdesign.co
+lunamedia.co
+lunchrock.co
+lyngdalhudterapi.no
+m1media.net
+m3gadownload.pl
+marblestyle.ru
+matb3aa.com
+max-p.men
+mearns-tractors.co.uk
+mebel-vstroika.ru
+medicines-choice.com
+meds-online24.com
+mega-bony-2017.pl
+meget.co.za
+metabar.ru
+mikrobiologies.ru
+militarysale.pro
+mmofreegames.online
+mobot.site
 moncleroutletonline.win
-mototsikl.org
-mouselink.co
-moviezbonkerssk.cf
-mriyadh.com
-mrlmedia.net
-mrwhite.biz
-msfsaar.de
-mug-na-chas-moscow.ru
-mydeathspace.com
-mydoctorok.ru
-mydownlodablefiles.com
-mylida.org
-myyour.eu
+monclervests.xyz
+mosdverka.ru
+music7s.me
+musirc.com
+mustwineblog.com
+mygameplus.ru
+myghillie.info
+myiptest.com
+myperiod.club
+mysexpics.ru
+myxdate.info
 nacap.ru
-nakozhe.com
-nerudlogistik.ru
-new-apps.ru
-nfljerseyscheapchinabiz.com
+nalogovyy-kodeks.ru
+narutonaruto.ru
+neobux-bg.info
+nero-us.com
+networkcheck.xyz
+nicovideo.jp
 nightvision746.weebly.com
-notasprensa.info
-nottyu.xyz
-o333o.com
-offer.camp
-okayimage.com
-oklogistic.ru
-okmusic.jp
-oktube.ru
-ok-ua.info
-olgacvetmet.com
-omsk.xrus.org
-online-x.ru
-onlythegames.com
-onthemarch.co
-openlibrary.org
-orgasmus-virtual.com
-ororodnik.goodbb.ru
-osagonline.ru
-ossmalta.com
-outshop.ru
-ovirus.ru
-owohho.com
-par-fallen.ga
-pastaleads.com
-patterntrader-en.com
-pc-test.net
-pearlisland.ru
-pechikamini.ru
-perfectpracticeweb.com
-petrovka-online.com
-petsblogroll.com
-pharmacyincity.com
-phormchina.com
-piccdata.com
-picswe.com
-pipki.r.acdnpro.com
-pk-pomosch.ru
-plaff-go.ru
-plastjulgranar.se
-platesauto.com
-playmsn.com
-plugingeorgia.com
-pl-vouchers.com
-podshipniki-ntn.ru
-pogruztehnik.ru
-porndroids.com
-pornobrazzers.biz
-porno-dojki.net
-pornoklad.net
+nikitsyringedrivelg.pen.io
+noscrapleftbehind.co
+nrjmobile.fr
+nudepatch.net
+odywpjtw.bloger.index.hr
+oecnhs.info
+offers.bycontext.com
+ok.ru
+oksrv.com
+onlinadverts.com
+onlyporno.ru
+ons-add.men
+openfrost.com
+openmediasoft.com
+oxford-book.com.ua
+ozas.net
+paintingplanet.ru
+partner-high.men
+partner-stop.men
+parvezmia.xyz
+peekyou.com
+perfection-pleasure.ru
+perm-profnastil.ru
+pics-group.com
+piuminiita.com
+playlott.com
+pogosh.com
+pokemongooo.ml
+polybuild.ru
+pomoc-drogowa.cba.pl
+popserve.adscpm.net
+porngalleries.top
+pornmania.pl
+pornolook.net
+pornoreino.com
 pornotubexxx.name
-prefersurvey.net
-printie.com
-privacyassistant.net
-proekt-gaz.ru
-prohoster.info
-prombudpostach.com.ua
-promgirldresses.xyz
-promover.org
-prostitutki-kharkova.org
-qitt.ru
-quality-traffic.com
+pornozhara.com
+preg.marketingvici.com
+privatamateure.com
+privatbank46.ru
+privatefx.all4invest.info
+prizefestival.mobi
+profolan.pl
+prokotov.com
+prostitutki-odessa.org
+purplestats.com
+qpypcx.com
 quebec-bin.com
-quick-offer.com
-quick-seeker.com
-ragecash.com
-ranksonic.info
-rapevideosmovies.com
-rasteniya-vs-zombi.ru
-realnye-otzyvy.info
-redirectme.net
-refererx.com
-reklama1.ru
-renecaovilla.online
-resant.ru
-ritlweb.com
-roleforum.ru
-ruex.org.ua
-rukino.org
-rustic-quiver.win
-rybalka-opt.ru
-sad-torg.com.ua
+quickbuck.com
+quickloanbank.com
+qwertty.net
+rabotaetvse.ru
+radiodigital.co
+realting-moscow.ru
+rebrand.ly
+reelheroes.net
+remontgruzovik.ru
+restaurantlescampi.com
+ric.info
+rock-cafe.info
+rockingclicks.com
+rockprogblog.com
+rusoft-zone.ru
+ruspdd.com
+russia-tao.ru
+russkoe-zdorovie.ru
+sajatvelemeny.com
+sa-live.com
+sampleletters.net
 sandhillsonline.com
-saneyes.com
-saratov.xrus.org
-sarm.tk
-savefrom.com
-saveriopiazza.it
-sbt-aqua.ru
-scanner-fred.top
-scanner-ivan.top
-scanner-nelson.top
-scanner-olga.top
-scenarii-1-sentyabrya.uroki.org.ua
+santechnik.jimdo.com
+saugatuck.com
+scanner-walter.top
+scanspyware.net
+scoopquest.com
+scottbywater.com
 scrapy.org
-sc-specialhost.com
-semalt.com
-seo-2-0.com
-seoanalyses.com
+scripted.com
+searchinterneat-a.akamaihd.net
+seemoreresultshu-a.akamaihd.net
+selectads.men
 seocheckupx.com
-seo-platform.com
-seo-prof1.xyz
-seorussian.ru
+seocheki.net
+seofied.com
+serdcenebolit.com
 sergiorossistore.online
-serialsway.ucoz.ru
 servingnotice.com
-sexblog.pw
-sexy-screen-savers.com
-shariki-zuma-lines.ru
-shmetall.com.ua
-sibdevice.ru
-sindragosa.comxa.com
-siteripz.net
-si-unique.com
+seryeznie-znakomstva.ru
+sexpornotales.com
+sextracker.be
+sextracker.de
+sharebutton.org
+shemale-sex.net
+shlyahten.ru
+shoppingmiracles.co.uk
+silverage.ru
+similardeals.net
+simple-image.com.ua
+sisi-go.ru
+sispe.com.br
+site-analyzer.com
+sitebeam.net
+sklad-24.ru
+skladvaz.ru
+skuteczna-dieta.co.pl
+slavia.info
+slimcdn.com
 slowmacfaster.trade
-slujbauborki.ru
-slutloadlive.com
-smallseotools.com
-snjatie-geroinovoy-lomki.ru
-snsdeainavi.info
-social-vestnik.ru
-sockshare.net
-sortthemesitesby.com
-souvenirua.com
-space-worry.ml
-splendorsearch-a.akamaihd.net
-sport-video-obzor.ru
-spywarebegone.com
-srgwebmail.nl
-stackthatbucks.com
+sluganarodu.ru
+small-game.com
+social-button.xyz
+socialbutton.xyz
+socialtrade.biz
+softlinesolutions.me
+solitaire-game.ru
+solmarket.by
+soochi.co
+spasswelt.net
+special-porn.com
 stair.registrydomainservices.com
-strongholdsb.ru
+stanthonyscatholicchurch.org
+stardevine.com
+starwars.wikia.com
+stauga.altervista.org
+steamoff.net
+stroy-portal22.ru
 students-cheapskate.ml
-studiofaca.com
 sudexpert66.ru
-superstarfloraluk.com
-svensk-poesi.com
-svtrd.com
-swinger-mobil.net
-syndicate.fun
-tackletarts.co
-teenbbw.yopoint.in
-thebestweightlosspills.ovh
-theguardlan.com
-thenetinfo.com
-tilido.com
-time-japan.ru
-titan-cloud.life
-titangel-vietnam.com
-tizanidinehcl2mg.blogspot.com
-topmira.com
-topsiteminecraft.com
-top-study.work
-touchmods.fr
-tourcroatia.co.uk
-track2.shop
-tracxn.com
-traderzplanet.in
-traffpartners.com
-tsyndicate.com
-turkeyreport.tk
-tvorozhnaja-zapekanka-recept.ru
-tv-spoty.info
-uchetunet.su
-ucsol.ru
-unionmarkt.de
-unisexjewelry.org
-unmaroll.ya.ru
-uptimechecker.com
-uroki.net
-usiad.net
-uytmaster.ru
-vapeface.club
-vchulkah.net
-venta-prom.ru
-vesnatehno.com
-via-energy-cumpara.com
-viel.su
+supernew.org
+survival.betteroffers.review
+swimpool.ca
+swiped.su
+sygraem.com
+tandvardshuset.net
+taqplayer.info
+taqywu51.soup.io
+tasteidea.com
+tengohydar.tk
+teslathemes.com
+thebestphotos.eu
+thefds.net
+themestotal.com
+thiegs.reco.ws
+titan-ads.life
+tizanidineandhydrocodone.blogspot.com
+tizanidinedosageforsleep.blogspot.com
+tizanidinehcl4mgisitanarcotic.blogspot.com
+tizanidinemusclerelaxant.blogspot.com
+tizanidinewithdrawal.blogspot.com
+topbestgames.com
+topsy.com
+tracksurf.daooda.com
+tramadolandtizanidine.blogspot.com
+truebeauty.cc
+tvteleport.ru
+twitlinks.com
+twittrading.com
+ukkelberg.no
+unblocksit.es
+unrealcommander.org
+urlopener.blogspot.com.au
+vapomnoncri.tk
+videochat.ph
+video-hollywood.ru
+video--production.com
 vipms.ru
-vipps.com.my
-voditeltrezviy.ru
-volume-pills.biz
+vipsiterip.org
+vitoriacabos.com
+vkonche.com
+vladimir.xrus.org
+voluumtrk.com
 vozbujdenie.com
-vsdshnik.com
-wallpapers-best.com
-warezaccess.com
-warningzscaler.heraeus.com
-waycash.net
-web-betting.ru
-webinstantservice.com
-westvilletowingservices.co.za
-whengirlsgowild.com
-wholesalenfljerseys.us.com
-wineitudes.wordpress.com
-winwotgold.pl
-wjgony.com
-womens-journal.net
-word-vorlagen.net
-worldmusicfests.com
-www.kabbalah-red-bracelets.com
-xingzi-vision.com
-xn----7sbaphztdjeboffeiof6c.xn--p1ai
+vpnmouse.com
+vucms.com
+vzlomsn.org
+watracker.net
+webix.biz
+webkeyit.com
+webmasters.stackexchange.com
+weboptimizes.com
+website-analytics.online
+websiteexplorer.info
+whatzmyip.net
+wholesalejerseysgaa.com
+winterclassichockeyjerseys.com
+worldhistory.biz
+worst-sites.online
+wosik-dach.service-for-web.de
+x-diesel.org
 xn----7sbifcamovvfggw9d.xn--p1ai
-xn--80aeahghtf8ac5i.xn--p1ai
-xn----8sbdbjgb1ap7a9c4czbh.xn--p1acf
-xn--b1agm2d.net
-xn----dtbndd4ae7eub.top
-xolodremont.ru
-xxxguitars.com
-xxx-treker.ru
-yaaknaa.info
-yopoint.in
-youjizz.vc
-your-bearings.com
-zacreditom.ru
-zakonobosago.ru
-zastenchivosti.net
-zetgie.com.pl
+xn--80aanaardaperhcem4a6i.com
+xn----8sbhefaln6acifdaon5c6f4axh.xn--p1ai
+xn--c1acygb.xn--p1ai
+xn--h1ahbi.com.ua
+xnxx-n.com
+xzlive.com
+yellowstonevisitortours.com
+zakon-ob-obrazovanii.ru
+za-music.mymobiplanet.com
+zatjmuzu.info
 zigarettenonlinekaufen.tumblr.com
-zolotoy-lis.ru
-zooggames.com
-zoominfo.com
-zvezdagedon.ru
-zytpirwai.net
-zzlgxh.com
+z-master.ru
+zrizvtrnpale.tk
+zvetki.ru
+zynax.ua
diff --git a/.dev-tools/test_units/random-referrers-for-whitelist-test.list b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
index 6356f9cfe..507c3f6e9 100644
--- a/.dev-tools/test_units/random-referrers-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
@@ -1,250 +1,250 @@
-03e.info
-10bet.com
-2kata.ru
-40cg.com
-5-steps-to-start-business.com
-acortarurl.es
-adobereader-free.ru
-adtech.fr
-alert-fdm.xyz
-alice.it
-alot.com
-am15.net
-am-se.com
-app5.letmacworkfaster.world
-apptester.tk
-atofilms.com
-auto.rusvile.lt
-autoua.top
-auto-zapchasti.org
-aviav.ru
-avtointeres.ru
-awaybird.ru
-azbaseimages.net
-azbukafree.com
-bamo.xsl.pt
-belinvestdom.by
-bestmarriages.com
-bestserials.com
-bestwebsiteawards.com
-bioscorp.ru
-blackhatworth.com
-blacktwhite.com
-blagovest-med.ru
-bloggen.be
-bmw-ark.ru
-boo-arts.com
-budilneg.xyz
-bukleteg.xyz
-burger-tycoon.com
-buttons-for-your-website.com
-camdolls.com
-cheapjerseysbizwholesale.us
-chinese-amezon.com
-cindymatches.com
-citetick.com
-cjmc.info
-cmhomestayagency.com
-codq.info
-compliance-alexa.xyz
-compliance-brian.xyz
-compliance-julia.top
-cool-wedding.net
-cowblog.fr
-crd.clan.su
-creatives.adbetclickin.pink
-culad.com
-customcatchcan.com
-day-news.info
-deluxedumps.com
+11pikachu.ru
+1314dh.com
+1bet.com
+202ch.com
+2pxg8bcf.top
+8558l.jobs.net
+883zy.com
+98oi.ru
+absolutelyanalog.com
+actionnooz.com
+adamoads.com
+add-add.men
+advancedcleaner.com
+alessandraleone.com
+alif-ba-ta.com
+allbizne.co.ua
+alloysteel.ru
+alyeskaresort.com
+amazingninja.com
+angel1777.kz
+apartmentbay.ru
+apartmentratings.com
+ausergrubhof.info
+automatic-seo.com
+autoseo-traffic.com
+avkzarabotok.info
+back.dog
+bag77.ru
+bazaronline24.ru
+beauty-bracelet.com
+begalka.xyz
+bestadbid.com
+bet365.com
+bioinnovate.co
+biznesrealnost.ru
+blog-hits.com
+bonzbuddy.com
+braindaily.xyz
+btnativenav.com
+buyantiviralwp.com
+buyessay3.blogspot.ru
+camel-beach.com
+cartierloveringreplica.xyz
+casablancamanor.co.za
+cbozhe.com
+c-english.ru
+cheapbarbour.online
+chelyabinsk.xrus.org
+cherrypointplace.ca
+chimiver.info
+cigarpass.com
+ciproandtizanidine.blogspot.com
+clickcash.com
+clippingphotoindia.com
+clksite.com
+coderstate.com
+codysbbq.com
+compliance-irvin.xyz
+csgo4.win
+cxpromote.com
+dailyfinancefix.com
+darkbooks.org
+d-black.bz
+ddospanel.com
+deda-moroza-zakaz.ru
+detoxmed24.ru
+dfwu1013.info
+diesel-parts28.ru
 dimkino.ru
-djihispano.com
-domainroam.win
-dynainbox.com
-easyukraine.com
-ecookna.com.ua
-editors.choice6912650.hulfingtonpost.com
-ekn-art.se
-elite-sex-finders.com
-eluxer.net
-erot.co
-escortslet.net
-eshop4u.jp
-falopicm.pw
-femdom.twiclub.in
+discovertreasure-a.akamaihd.net
+dividendo.ru
+doctormakarova.ru
+dokfilms.net
+dolohen.com
+doyouknowtheword-flummox.ml
+dtnlyss.com
+e-collantes.com
+educatemetv.com
+ekaterinburg.xrus.org
+eloxal.ru
+essay-edu.biz
+euromasterclass.ru
+exoclick.com
+expdom.com
+expertblog.info
+ezigarettenshop1.yolasite.com
+fandlr.com
 fetlifeblog.com
-fickenprivat.info
-fivedwld.cf
-frameimage.org
-fuck-paid-share-buttons.xyz
-fym.com.ru
-gallerylisting.com
+fickluder69.com
+filesclub.net
+filmgo.ru
+film-one.ru
+findsexguide.com
+flooringinstallation-edmonton.com
+forex.osobye.ru
+forminecrafters.ru
+freakycheats.com
+freemags.cc
+ftns.ru
+funponsel.com
+g7m.pl
+galeon.com
 garciniaxt.us
-gavuer.ru
-getoutofdebtfree.org
-goblacked.com
-gomusix.com
-gosmeb.ru
-gpms.org.my
-greatdealshop.com
-grtyi.com
-hkladys.com
-hotblognetwork.com
-hotxnights.info
-housekuba.org
-howtowhitenteethfast.xyz
-hreade.com
-hulfingtonpost.com
-husky-shop.cz
-hut1.ru
-hyiphunter.org
-hyipmanager.in
-ico.re
-ikearugs.xyz
-imgarit.pw
-immigrational.info
-indianmedicaltourismshop.com
-internet-apteka.ru
-investyb.com
-irkutsk.zrus.org
-itsdp3.com
-javitas.info
-kamagragelusa.net
-kam-dom.ru
-kareliatobacco.ru
-ladov.ru
-lanadelreyfans.us
-li-er.ru
-linkarena.com
-liveinternet.ru
-lombia.co
-lotto6888.com
-lovelycraftyhome.com
-macdamaged.tech
-madot.onlinewebshop.net
-mafa-free.com
-mahnwachen-helfen.info
-maximpartnerspr.com
-megaindex.ru
-mexicosleevegastrectomy.com
-m-google.xyz
-mmgq.ru
+gg-arena.ru
+gorodservis.ru
+gsmlab.pl
+guardlink.com
+heartofpayne.xyz
+highstairs-a.akamaihd.net
+hit-kino.ru
+hmywwogw.bloger.index.hr
+hop.clickbank.net
+hotelcrocenzi.sm
+houseofgaga.ru
+hoztorg-opt.ru
+iccornacircri.cf
+ifirestarter.ru
+imediadesk.com
+innoslicon.com
+intim-uslugi.info
+investzalog.ru
+iphantom.com
+it-max.com.ua
+itservicesthatworkforyou.com
+javstock.com
+jerseysbizwholesalecheap.com
+johannesburgsingles.co.za
+kabbalah-red-bracelets.com
+kchaxton.com
+ketrzyn.pl
+kletkimehan.ru
+knowsitall.info
+krasnodar.xrus.org
+kupit-adenu.ru
+kutikomi.net
+kwzf.net
+lacave.ntic.fr
+larger.io
+letolove.ru
+lincolntheatre.com
+lonely-mature.com
+louboutinshoes.xyz
+luckyshop.net.ua
+m3gadownload.pl
+mackeeper-land-672695126.us-east-1.elb.amazonaws.com
+managerpak204.weebly.com
+matchpal-a.akamaihd.net
+matematikus.info
+mcadamssupplyco.com
+mcar.in.ua
+mega-bony2017.pl
+mensandals.xyz
+mirmedinfo.ru
+mmofreegames.online
+mobile.ok.ru
 mobilierland.com
-moonci.ru
-mototsikl.org
-mouselink.co
-musicstock.me
-muz-baza.net
-my-cash-bot.co
-notfastfood.ru
-ntic.fr
-oballergiya.ru
-obnal.org
-offtopic.biz
-onlyforemont.ru
-o-o-8-o-o.com
-otbelivanie-zubov.com
-parajumpersstore.online
-pic2fly.com
-pivka.xyz
-pons-presse.com
-pooleroadmedicalcentre.co.uk
-pornobrazzers.biz
-pornokorol.com
-pornosemki.info
-pornozhara.com
-privatov-zapisi.ru
-privetsochi.ru
-privhosting.com
-projectforte.ru
-pufip.com
-push-ad.com
-putitin.me
-quit-smoking.ga
-qwertty.net
-realtytimes.com
-redirectme.net
-reklama1.ru
-remont-fridge-tv.ru
-restaurantlescampi.com
-richinvestmonitor.com
-robertefuller.com
-ruscopybook.com
-rustic-quiver.win
-sabaapress.com
-sad-torg.com.ua
-salut-camp.ru
-sampleletters.net
-sanatorrii.ru
-sarafangel.ru
-sbtdesign.co.uk
-scanner-nelson.top
-semp.net
-serptehnika.ru
+moetomnenie.com
+moje-recenze.cz
+mrvideospornogratis.xxx
+mydirtyhobby.com
+mydownloadengine.com
+narco24.me
+netvouz.com
+novodigs.com
+oksrv.com
+onemactrckr.com
+origin-my.ru
+osagonline.ru
+osoznanie-narkotikam.net
+oz-offers.com
+panicatack.com
+partner-high.men
+partnerworkroom.men
+pavlodar.xkaz.org
+picturesmania.com
+pl.aasoldes.fr
+platinumdeals.gr
+poisk-zakona.ru
+popmarker.com
+preg.marketingvici.com
+printingpeach.com
+professionalwritingservices15.blogspot.ru
+promgirldresses.xyz
+prostitutki-kharkova.org
+rainbowice.ru
+registry-cleaner.net
+ricorsogiustizia.org
+riders.ro
+rucrypt.com
+samara.rosfirm.ru
+savefrom.com
+scanner-ivan.top
+scrapy.org
+selectads.men
 service.adtech.fr
-sexgalleries.top
-sexs-foto.top
-shoppingjequiti.com.br
-shymkent.xkaz.org
-sicfor.bcu.cc
-sildenafil-tadalafil.info
-smartadserver.com
-smart-balancewheel.com
-spammen.de
-sps-shop.com
-staff.prairiesouth.ca
-start.myplaycity.com
-stathat.com
-staynplay.net
+sexobzor.info
+sharebutton.org
+sherlock.se
+shikiso.info
+shtora66.ru
+sisi-go.ru
+site-speed-checker.site
+skuteczna-dieta.co.pl
+slavia.info
+smsactivator.ru
+social-fun.ru
+soft1.ru
+sohoindia.net
+speechfoodie.com
+spyfu.com
+stats-collector.org
 stjamesschool.info
-superkanpo.com
-supers.com.ua
-svetodiodoff.ru
-taboola.com
-tam-gde-more.ru
-t-bygg.com
-tech4master.com
-thegameriders.com
-timhost.ru
-tizanidineonline.blogspot.com
-torture.ml
-toys.erolove.in
-tracklead.net
-traffic100.com
-traffic2money.com
-truemfilelj.gq
-trustedhealthtips.com
-tuberkulezanet.ru
-unrealcommander.org
-url-img.link
-verymes.xyz
-vesnatehno.ru
-video-chat.love
-video--production.com
-visionwell.com.cn
-vizitki.net
-vote-up.ru
-vrnelectro.ru
-wdrake.com
-website-datenbank.de
-weekes.biz.tc
-whengirlsgowild.com
-wholesalejerseys-cheapest.com
-wineration.com
-wordkeyhelper.com
-worldlovers.ru
+stockspmb.info
+stroilka.info
+swingerseiten.com
+terrafootwear.us
+tizanidinehcl4mgisitanarcotic.blogspot.com
+tomck.com
+tongkatmadura.info
+topvidos.ru
+totu.info
+traffic2cash.org
+try-rx.com
+ttsq.fr
+tubo360.com
+twodollarshows.com
+ucoz.ru
+undergroundcityphoto.com
+unece.org
+vbabule.net
+vektorpress.ru
+videochat.life
+videogamesecrets.com
+video-hollywood.ru
+videokrik.net
+videtubs.pl
+wahicbefa31.soup.io
+webadvance.club
+website-audit.com.ua
+whipme.yopoint.in
+williamrobsonproperty.com
 worldmusicfests.com
-xboxster.ru
-xfluro.com
-xgames-04.com
-xn--1-8sbcpb0bdm8k6a.xn--p1ai
-xolodremont.ru
-xtremeeagles.net
-xwatt.ru
-yebocasino.co.za
-youghbould.wordpress.com
-yourdesires.ru
-zapatosenventa.info
-zerocash.msk.ru
-zigarettenonlinekaufen2.bloog.pl
-zscalertwo.net
+xn--80adaggc5bdhlfamsfdij4p7b.xn--p1ai
+xn--80ak6aa92e.com
+xnxx699.com
+xtraffic.plus
+xzlive.com
+zhongwenlink.com
+zigarettenonlinekaufen2.drupalgardens.com
+zolotoy-lis.ru
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index a683b3cc9..f1eb3c24d 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.txt
@@ -1,12 +1,21 @@
-<html>
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
+</html><html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body>
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.16.1</center>
 </body>
 </html>
-ody>
-</html><html>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body>
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -572,14 +581,4 @@ ody>
 <h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
 <p>This is merely used for testing !!!</p>
 </body>
-</html><!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to NginX</title>
-</head>
-<body>
-<div align=center>
-<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
-<p>This is merely used for testing !!!</p>
-</body>
 </html>
\ No newline at end of file
diff --git a/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index 3e60bde86..290c48e19 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.184.226.236	0;
+35.188.1.99	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 41ca03e4c..edf424d1e 100644
Binary files a/.latest_release/bots.d.tar.gz and b/.latest_release/bots.d.tar.gz differ
diff --git a/.latest_release/conf.d.tar.gz b/.latest_release/conf.d.tar.gz
index 5d3efa169..43090b082 100644
Binary files a/.latest_release/conf.d.tar.gz and b/.latest_release/conf.d.tar.gz differ
diff --git a/AUTO-CONFIGURATION.md b/AUTO-CONFIGURATION.md
index a96ead99f..cf638d775 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2020.02.1960
+#### Version: V4.2020.02.1962
 #### Bad Referrers Blocked: [6825](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [562](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index ee565cf5c..5e9ccd11b 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2020.02.1960
+#### Version: V4.2020.02.1962
 #### Bad Referrers Blocked: [6825](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [562](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
diff --git a/README.md b/README.md
index ba557a12d..5b57af816 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 ##### The Ultimate Nginx Bad Bot, User-Agent, Spam Referrer Blocker, Adware, Malware and Ransomware Blocker, Clickjacking Blocker, Click Re-Directing Blocker, SEO Companies and Bad IP Blocker with Anti DDOS System, Nginx Rate Limiting and Wordpress Theme Detector Blocking. Stop and Block all kinds of bad internet traffic even Fake Googlebots from ever reaching your web sites. [PLEASE SEE: Definition of Bad Bots](#define-bad-bots)
 
 _______________
-#### Version: V4.2020.02.1960
+#### Version: V4.2020.02.1962
 #### Bad Referrers Blocked: [6825](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [562](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
diff --git a/_google_analytics_ghost_spam/README.md b/_google_analytics_ghost_spam/README.md
index 2ccaf42d2..e59ea508d 100644
--- a/_google_analytics_ghost_spam/README.md
+++ b/_google_analytics_ghost_spam/README.md
@@ -3,7 +3,7 @@
 # EASY CONFIGURATION INSTRUCTIONS FOR STOPPING GOOGLE ANALYTICS "GHOST" SPAM
 
 _______________
-#### Version: V4.2020.02.1960
+#### Version: V4.2020.02.1962
 #### Bad Referrers Blocked: [6825](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [562](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
diff --git a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100755
--- a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf
+++ b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/conf.d/globalblacklist-testing-version.conf b/conf.d/globalblacklist-testing-version.conf
index 6f8d6b6c5..17f604c48 100644
--- a/conf.d/globalblacklist-testing-version.conf
+++ b/conf.d/globalblacklist-testing-version.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2020.02.1960
-### Updated: Thu Feb  6 22:41:58 SAST 2020
+### Version: V3.2020.02.1962
+### Updated: Thu Feb  6 23:44:33 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index 1425d237e..48cd9abb5 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:57 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:32 SAST 2020
 ### Bad Referrer Count: 6825
 ### Bad Bot Count: 562
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index 27af59095..f25e8fbdf 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2020.02.1960
-### Updated: Thu Feb  6 22:41:59 SAST 2020
+### Version: V4.2020.02.1962
+### Updated: Thu Feb  6 23:44:34 SAST 2020
 ### Bad Bot Count: 562
 ###################################################
 ### Version Information ##