diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index 827f63536..82df86221 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:37 SAST 2019
+### Version: V3.2019.07.1737
+### Updated: Tue Jul  2 14:42:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 827f63536..82df86221 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:37 SAST 2019
+### Version: V3.2019.07.1737
+### Updated: Tue Jul  2 14:42:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 827f63536..82df86221 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:37 SAST 2019
+### Version: V3.2019.07.1737
+### Updated: Tue Jul  2 14:42:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 827f63536..82df86221 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:37 SAST 2019
+### Version: V3.2019.07.1737
+### Updated: Tue Jul  2 14:42:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index 827f63536..82df86221 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1736
-### Updated: Tue Jul  2 14:24:37 SAST 2019
+### Version: V3.2019.07.1737
+### Updated: Tue Jul  2 14:42:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index f364dd6ae..dfa93cc82 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/setup-ngxblocker/modified/arch.conf.modified b/.dev-tools/setup-ngxblocker/modified/arch.conf.modified
index 0269e0f9d..25cd0c350 100644
--- a/.dev-tools/setup-ngxblocker/modified/arch.conf.modified
+++ b/.dev-tools/setup-ngxblocker/modified/arch.conf.modified
@@ -28,10 +28,10 @@ http {
     #tcp_nopush     on;
  	
 
-	##
-	# Nginx Bad Bot Blocker Includes
-	# REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-	##
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
 	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
  	include /etc/nginx/conf.d/globalblacklist.conf;
  
diff --git a/.dev-tools/setup-ngxblocker/modified/centos.conf.modified b/.dev-tools/setup-ngxblocker/modified/centos.conf.modified
index ec2d08a7e..aaa446334 100644
--- a/.dev-tools/setup-ngxblocker/modified/centos.conf.modified
+++ b/.dev-tools/setup-ngxblocker/modified/centos.conf.modified
@@ -25,10 +25,10 @@ http {
     tcp_nopush          on;
  	
 
-	##
-	# Nginx Bad Bot Blocker Includes
-	# REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-	##
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
 	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
  	include /etc/nginx/conf.d/globalblacklist.conf;
  
diff --git a/.dev-tools/setup-ngxblocker/modified/fedora.conf.modified b/.dev-tools/setup-ngxblocker/modified/fedora.conf.modified
index 39ebf8b12..709b85100 100644
--- a/.dev-tools/setup-ngxblocker/modified/fedora.conf.modified
+++ b/.dev-tools/setup-ngxblocker/modified/fedora.conf.modified
@@ -25,10 +25,10 @@ http {
     tcp_nopush          on;
  	
 
-	##
-	# Nginx Bad Bot Blocker Includes
-	# REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-	##
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
 	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
  	include /etc/nginx/conf.d/globalblacklist.conf;
  
diff --git a/.dev-tools/setup-ngxblocker/modified/opensuse.conf.modified b/.dev-tools/setup-ngxblocker/modified/opensuse.conf.modified
index c74fb95c3..4e41cc065 100644
--- a/.dev-tools/setup-ngxblocker/modified/opensuse.conf.modified
+++ b/.dev-tools/setup-ngxblocker/modified/opensuse.conf.modified
@@ -40,10 +40,10 @@ http {
     #tcp_nopush     on;
  	
 
-	##
-	# Nginx Bad Bot Blocker Includes
-	# REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-	##
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
 	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
  	include /etc/nginx/conf.d/globalblacklist.conf;
  
diff --git a/.dev-tools/setup-ngxblocker/modified/ubuntu16.conf.modified b/.dev-tools/setup-ngxblocker/modified/ubuntu16.conf.modified
index 611a4a6b3..55bba61ef 100644
--- a/.dev-tools/setup-ngxblocker/modified/ubuntu16.conf.modified
+++ b/.dev-tools/setup-ngxblocker/modified/ubuntu16.conf.modified
@@ -17,10 +17,10 @@ http {
 	tcp_nopush on;
  	
 
-	##
-	# Nginx Bad Bot Blocker Includes
-	# REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-	##
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
 	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
  	include /etc/nginx/conf.d/globalblacklist.conf;
  
diff --git a/.dev-tools/setup-ngxblocker/modified/ubuntu18.conf.modified b/.dev-tools/setup-ngxblocker/modified/ubuntu18.conf.modified
index c6314e548..5454fdb65 100644
--- a/.dev-tools/setup-ngxblocker/modified/ubuntu18.conf.modified
+++ b/.dev-tools/setup-ngxblocker/modified/ubuntu18.conf.modified
@@ -18,10 +18,10 @@ http {
 	tcp_nopush on;
  	
 
-	##
-	# Nginx Bad Bot Blocker Includes
-	# REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-	##
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
 	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
  	include /etc/nginx/conf.d/globalblacklist.conf;
  
diff --git a/.dev-tools/setup-ngxblocker/original/arch.conf.modified b/.dev-tools/setup-ngxblocker/original/arch.conf.modified
index 0269e0f9d..25cd0c350 100644
--- a/.dev-tools/setup-ngxblocker/original/arch.conf.modified
+++ b/.dev-tools/setup-ngxblocker/original/arch.conf.modified
@@ -28,10 +28,10 @@ http {
     #tcp_nopush     on;
  	
 
-	##
-	# Nginx Bad Bot Blocker Includes
-	# REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
-	##
+    ##
+    # Nginx Bad Bot Blocker Includes
+    # REPO: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+    ##
 	include /etc/nginx/conf.d/botblocker-nginx-settings.conf; 
  	include /etc/nginx/conf.d/globalblacklist.conf;
  
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 609536562..896ffe576 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.193.7.13             0;
+104.154.120.187         0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index f364dd6ae..dfa93cc82 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 746c3f03f..5e7c0ed8e 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 @@
-35.224.112.202	1;
+35.184.226.236	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 500584a94..3e60bde86 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 @@
-35.224.112.202	0;
+35.184.226.236	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 f364dd6ae..dfa93cc82 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 746c3f03f..5e7c0ed8e 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 @@
-35.224.112.202	1;
+35.184.226.236	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 500584a94..3e60bde86 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 @@
-35.224.112.202	0;
+35.184.226.236	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 f364dd6ae..dfa93cc82 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 746c3f03f..5e7c0ed8e 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 @@
-35.224.112.202	1;
+35.184.226.236	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 500584a94..3e60bde86 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 @@
-35.224.112.202	0;
+35.184.226.236	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 f364dd6ae..dfa93cc82 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 6c3474a02..609536562 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,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
-104.154.120.187         0;
-35.184.96.71            0;
+35.193.7.13             0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index 86d7efe35..1569a3dc3 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 e24752400..e0315ebf1 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;
+35.192.85.2             0;
 35.202.145.110          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 f364dd6ae..dfa93cc82 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 e7fdfcf45..c063eb933 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,6 +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.192.85.2             0;
-35.184.96.71            0;
+35.202.145.110          0;
 104.154.120.187         0;
+35.184.96.71            0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index f364dd6ae..dfa93cc82 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 1e440af25..e291e2258 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 @@
-DomainSigmaCrawler
-Express WebPictures
-Grabber
-InfoNaviRobot
-JustView
-Kozmosbot
-Nessus
-Net Vampire
-WebmasterWorldForumBot
-WebReaper
+404checker
+AfD-Verbotsverfahren
+Blackboard
+Likse
+Metauri
+RankurBot
+ReGet
+SEOlyticsCrawler
+trendiction.com
+WebLeacher
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index 5c186dab3..919a0d8a9 100644
--- a/.dev-tools/test_units/random-bots-for-test.list
+++ b/.dev-tools/test_units/random-bots-for-test.list
@@ -2,249 +2,249 @@
 404checker
 404enemy
 80legs
-Abonti
-Aboundex
-Aboundexbot
-Acunetix
 ADmantX
-AfD-Verbotsverfahren
+AhrefsBot
 AllSubmitter
-archive.org_bot
-Attach
+Anarchie
+Apexoo
+ASPSeek
+Asterias
 autoemailspider
 BackDoorBot
 Backlink-Ceck
+BacklinkCrawler
+BackStreet
 BackWeb
-Badass
 Bandit
 Barkrowler
 BatchFTP
+BDCbot
 BDFetch
-BetaBot
-BotALot
-Brandprotect
+Bitacle
+Blackboard
+BlackWidow
+BLEXBot
+Brandwatch
 Buddy
 BuiltBotTough
-Bullseye
+BuiltWith
 BunnySlippers
-CATExplorador
+BuzzSumo
 CazoodleBot
-Cegbfeieh
 CheeseBot
-CherryPicker
-Cliqzbot
-coccocbot-web
-Collector
-com.plumanalytics
-crawler4j
+CheTeam
+ChinaClaw
+Claritybot
+Cogentbot
+Cosmos
 crawler.feedback
-CrazyWebCrawler
-Crescent
+crawl.sogou.com
 CrunchBot
+CSHttp
 Curious
-demandbase-bot
+Custo
+Deusu
 Devil
-Dirbuster
-Disco
-Dispatch
+Digincore
+DIIbot
 DittoSpyder
-DnyzBot
-DomainCrawler
-DomainStatsBot
-Download Wonder
-Dragonfly
-Drip
+DomainAppender
+Dotbot
 DSearch
-DTS Agent
-ECCP/1.0
-Ecxi
+eCatch
 EirGrabber
-evc-batch
+EMail Siphon
 Express WebPictures
 ExtLinksBot
-Extractor
-ExtractorPro
-Extreme Picture Finder
 EyeNetIE
-Ezooms
+facebookscraper
 FDM
 Fimap
-Flunky
 Foobot
-FrontPage
-FyberSpider
+Freeuploader
+Fyrebot
+GalaxyBot
 Genieo
-GermCrawler
 Getintent
-Gigablast
+GetRight
+GetWeb
+Gigabot
 G-i-g-a-b-o-t
 Gotit
-Go!Zilla
-GrabNet
-GrapeFX
 GrapeshotCrawler
+GT::WWW
+Haansoft
 HaosouSpider
 Harvest
-HEADMasterSEO
+Havij
 Heritrix
 Hloader
-HMView
-HTTrack
-Humanlinks
+HTMLparser
+HTTP::Lite
 HybridBot
 Iblog
 IDBot
+IlseBot
 Image Fetch
 Image Sucker
-InfoNaviRobot
-IstellaBot
+Intelliseek
+InterGET
+Internet Ninja
+Iria
 JamesBOT
 JetCar
-Jorgee
-Jyxobot
-Keyword Density
+Jetty
+JikeSpider
+JOC Web Spider
+Joomla
+JustView
+Kenjin Spider
 Larbin
-LexiBot
+LeechFTP
 Lftp
-LibWeb
-Linkdexbot
+Lightspeedsystems
+Likse
+LinkextractorPro
+LinkWalker
 LinqiaMetadataDownloaderBot
-LinqiaScrapeBot
+LinqiaRSSBot
 Lipperhey
 Lipperhey Spider
-Ltx71
-lwp-request
-LWP::Simple
+LNSpiderguy
 Magnet
 Majestic12
-Mata Hari
-meanpathbot
-Meanpathbot
+Majestic SEO
+MarkMonitor
+Masscan
 MegaIndex.ru
+Metauri
 MFC_Tear_Sample
-MIIxpc
-Mojeek
-Morfeus Fucking Scanner
-MS Web Services Client Protocol
-muhstik-scan
+Microsoft Data Access
+Microsoft URL Control
+Mister PiX
+Mr.4x3
+MSIECrawler
+Msrabot
 Name Intelligence
-Navroad
-Nessus
+Nameprotect
+NearSite
+Needle
+NetAnts
 Netcraft
-netEstate NE Crawler
-NetLyzer
 NetMechanic
-NetSpider
-Netvibes
-NetZIP
+Nettrack
+Nibbler
 NICErsPRO
+Niki-bot
+NimbleCrawler
+Nimbostratus
 Nmap
 Nutch
+oBot
 Offline Explorer
-Openfind
-OpenLinkProfiler
-Openvas
+Offline Navigator
+OnCrawl
+OpenVAS
 OutclicksBot
+OutfoxBot
 PageGrabber
-Pavuk
-PECL::HTTP
-PeoplePal
-PictureFinder
+page scorer
+Pandalytics
+Panscient
+Picscout
 Pimonster
 Pi-Monster
 Pixray
-PleaseCrawl
 plumanalytics
-Pockey
-POE-Component-Client-HTTP
 Probethenet
+ProPowerBot
+Psbot
 Pump
 PxBroker
-QueryN Metasearch
-Quick-Crawler
-RankActive
-RankFlex
-RankingBot
-RankingBot2
+RankActiveLinkBot
+Rankivabot
 RankurBot
+RealDownload
 Reaper
-RepoMonkey
-Rogerbot
+RebelMouse
+RedesScrapy
+Ripper
 s1z.ru
-ScanAlert
+SBIder
 scan.lol
-ScreenerBot
-SearchmetricsBot
+ScoutJet
+Screaming
+Searchestate
 SemrushBot
-SEOkicks-Robot
-Seomoz
+SEOkicks
+SeoSiteCheckup
 SEOstats
-SiteExplorer
-Siteimprove
-Site Sucker
-Sitevigil
+Siphon
+SiteSnagger
+SiteSucker
 SlySearch
-SMTBot
-Snapbot
+Snake
+Snoopy
 SocialRankIOBot
+Sociscraper
 sogouspider
 Sogou web spider
 Sottopop
-SpaceBison
+SpankBot
 Spanner
-sp_auditbot
-Spbot
-SputnikBot
+Spinn3r
 spyfu
-Sqworm
+Sqlworm
+Stripper
 Sucker
-SuperHTTP
-Suzuran
-sysscan
 T8Abot
-tAkeOut
-Teleport
-TeleportPro
 Telesoft
-TheNomad
+The Intraformant
 Thumbor
-Titan
-trendiction.com
-True_Robot
+TightTwatBot
+Toweyabot
+Trendiction
+Trendictionbot
 Turingos
+TurnitinBot
+Twice
+Typhoeus
 UnisterBot
+Upflow
+URLy Warning
+URLy.Warning
 Vacuum
-VCI
-VidibleScraper
+Vagabondo
+VeriCiteCrawler
 Voil
 Voltron
 WebBandit
 WebCollage
+Web Collage
+WebCopier
+WebEnhancer
 Web Enhancer
+WebFetch
+Web Fetch
 Web Fuck
-WebImageCollector
-WebLeacher
-WebPix
+WebmasterWorldForumBot
+Web Pix
 WebReaper
-WebSauger
-WebsiteExtractor
 Webster
-WebWhacker
+WebStripper
 WebZIP
-Whatweb
+Whack
+Whacker
 Who.is Bot
-WinHTTrack
-WiseGuys Robot
-WISENutbot
-Wonderbot
+Widow
 Woobot
 WWW-Collector-E
-WWW::Mechanize
+WWW-Mechanize
 WWWOFFLE
-Xaldon WebSpider
-xpymep1.exe
-Zauba
-zauba.io
-Zeus
+Xaldon_WebSpider
+Xenu
+Zade
+Zermelo
 ZmEu
+ZumBot
 ZyBorg
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 2f7a336ed..98f4532fb 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 @@
+80legs
 Abonti
+Aboundex
 Aboundexbot
+Acunetix
+ADmantX
 AfD-Verbotsverfahren
-Aipbot
-Alexibot
-AlphaBot
-Apexoo
+AIBOT
+Alligator
+AllSubmitter
+Anarchie
 archive.org_bot
 Asterias
 Attach
-autoemailspider
+Backlink-Ceck
+backlink-check
 BacklinkCrawler
-BackWeb
-Badass
-BatchFTP
+Barkrowler
+Battleztar Bazinga
 BBBike
 BDCbot
-BDFetch
-BetaBot
-Blackboard
-Black Hole
-Blow
+Bigfoot
 Boardreader
+Bolt
 BotALot
-Buddy
 BuiltBotTough
-BunnySlippers
-BuzzSumo
-CATExplorador
-CCBot
+BuiltWith
+CazoodleBot
+Cegbfeieh
 CheTeam
 ChinaClaw
-Chlooe
-Collector
-Copier
+Claritybot
+coccocbot-web
+cognitiveseo
+Cosmos
 Craftbot
 crawler4j
+crawler.feedback
 crawl.sogou.com
-Crescent
-CrunchBot
-CSHttp
-Curious
-Custo
 DataCha0s
+DBLBot
 demandbase-bot
+Demon
 Deusu
 Devil
-Digincore
-Dirbuster
-Disco
+DigitalPebble
 Discobot
 Discoverybot
 Dispatch
-DnyzBot
-DomainCrawler
+DittoSpyder
+DomainAppender
 DomainStatsBot
-Dotbot
-Download Wonder
-Drip
-DSearch
-Ebingbong
-EMail Siphon
-EMail Wolf
+Dragonfly
+DTS Agent
+Ecxi
+EirGrabber
 EroCrawler
-Evil
 Express WebPictures
 Extractor
-ExtractorPro
-facebookscraper
-Fimap
+FemtosearchBot
 FlashGet
+Flunky
+FrontPage
 FyberSpider
+GalaxyBot
 Genieo
 GermCrawler
-Getintent
-GetRight
+Gigablast
 Go-Ahead-Got-It
+Gotit
 GoZilla
-Grabber
-GrabNet
-GrapeshotCrawler
-GT::WWW
-Haansoft
-HaosouSpider
+Go!Zilla
+GridBot
 Harvest
-Havij
-HEADMasterSEO
-Iblog
-Id-search
+HMView
+HTMLparser
+Humanlinks
+IDBot
 IlseBot
-Image Fetch
 Image Sucker
 Indy Library
-instabid
-Intelliseek
+InfoNaviRobot
 InterGET
-ips-agent
+Internet Ninja
+internetVista monitor
+IRLbot
 IstellaBot
 JamesBOT
+JetCar
 Jetty
-JikeSpider
-Jorgee
+JOC Web Spider
+JustView
 Kenjin Spider
 Kozmosbot
 Lanshanbot
+Larbin
 LeechFTP
-LeechGet
 LexiBot
-Libwhisker
-Linkdexbot
+Likse
+LinkextractorPro
 LinkpadBot
+LinkScan
+LinksManager
 LinkWalker
-LinqiaRSSBot
-Lipperhey
+LinqiaMetadataDownloaderBot
+LinqiaScrapeBot
 Lmspider
 LNSpiderguy
 Ltx71
-lwp-trivial
-Mag-Net
-magpie-crawler
-Mail.RU_Bot
-Majestic SEO
-Masscan
-Mass Downloader
+Magnet
+Majestic12
+Majestic-SEO
+MarkMonitor
 Mata Hari
-meanpathbot
-MeanPath Bot
+Meanpathbot
 mediawords
+MegaIndex.ru
 Metauri
+Microsoft Data Access
 Microsoft URL Control
 MIIxpc
 Mojeek
-Morfeus Fucking Scanner
 Mr.4x3
-MSIECrawler
-Msrabot
-MS Web Services Client Protocol
-muhstik-scan
-Musobot
-NetLyzer
+MSFrontPage
+NearSite
+Needle
+Nessus
+Netcraft
 NetMechanic
+NetSpider
 Net Vampire
-NextGenSearchBot
-Niki-bot
-NimbleCrawler
-Nmap
+NetZIP
+Nimbostratus
+Ninja
+NPbot
 Nutch
-Octopus
-Offline Navigator
-OnCrawl
-Openfind
-Openvas
+oBot
+Offline Explorer
+OpenLinkProfiler
+OpenVAS
 OrangeBot
 OrangeSpider
 OutclicksBot
-OutfoxBot
+PageAnalyzer
+PageScorer
 Pandalytics
 pcBrowser
+PHPCrawl
+Pi-Monster
 Pixray
 Pockey
 POE-Component-Client-HTTP
 Probethenet
-ProPowerBot
-PxBroker
+Psbot
 PyCurl
 QueryN Metasearch
-Quick-Crawler
 RankActiveLinkBot
-RankingBot2
-Reaper
-RebelMouse
-ReGet
+RankingBot
+RankurBot
+RealDownload
+RedesScrapy
+RepoMonkey
 RocketCrawler
-s1z.ru
-SalesIntelligent
+Rogerbot
+SBIder
+ScanAlert
 Scanbot
 Scrapy
-Screaming
-SearchmetricsBot
+Semrush
+SemrushBot
 SEOkicks
 SEOkicks-Robot
 SEOlyticsCrawler
 Seomoz
 SeoSiteCheckup
-sexsearcher
+serpstatbot
+Shodan
+SiteExplorer
+Siteimprove
 SiteSucker
+Sitevigil
 SlySearch
+SMTBot
 Snake
 Snapbot
+Sociscraper
 sogouspider
-Sogou web spider
 Sosospider
-Sottopop
 Spammen
-SpankBot
-Spbot
-SputnikBot
+sp_auditbot
+Spinn3r
 spyfu
-Sqlworm
-Sqworm
 Steeler
-SuperBot
-SuperHTTP
+Surfbot
 Swiftbot
-Szukacz
+sysscan
 T0PHackTeam
-Teleport
-TeleportPro
+T8Abot
+Telesoft
+Telesphorep
 The Intraformant
-Thumbor
+TightTwatBot
+Titan
+Toata
 Tracemyfile
-Trendiction
-Trendictionbot
+trendiction.com
+trendiction.de
+Turingos
+Twice
 Typhoeus
 UnisterBot
-URLy.Warning
-Vacuum
-Virusdie
-VoidEYE
+Upflow
+VB Project
 Voil
 Wallpapers/3.0
-WallpapersHD
-Webalta
-WebCopier
-Web Enhancer
-WebGo IS
+WASALive-Bot
+WebAuto
+Web Auto
+WebBandit
+WebCollage
+Web Collage
+WEBDAV
+WebEnhancer
+WebFetch
 WebImageCollector
+WebLeacher
 WebmasterWorldForumBot
-webmeup-crawler
+Web Pix
 WebSauger
-Web Sauger
 Webshag
-WebsiteQuester
+Webster
+WebSucker
 Web Sucker
 WebZIP
-Whack
+WeSEE
 Whacker
 Who.is Bot
-WinHTTrack
+Widow
+WiseGuys Robot
 WISENutbot
 Wonderbot
-Wotbox
-WPScan
-WWW::Mechanize
+WWWOFFLE
 x22Mozilla
 Xaldon_WebSpider
-Xenu
-Zauba
+YoudaoBot
+Zade
 zauba.io
 Zermelo
+zgrab
+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 1fa9d4e96..d59c550a1 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 @@
-1kdailyprofit.me
-2daytrendingnews.com
-dnepropetrovsk.mistr-x.org
-eugenevaultstorage.com
-kinohit1.ru
-pulseonclick.com
-takeflyte.com
-videos-for-your-business.com
-volgograd.xrus.org
-womama.ru
+dmmspy.com
+eorogo.top
+girlporn.ru
+kino-rating.ru
+m5home.ru
+printdirectforless.com
+sudexpert66.ru
+thetoiletpaper.com
+tubo360.com
+typer.one
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 7ebb7dbdb..4f391dea6 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 @@
-101billion.com
-1hwy.com
-1j7740kd.website
-2020iscoming.info
-24videos.tv
-2drittel.de
-66cpwgln.space
-7makemoneyonline.com
-8si.ru
-8xv8.com
-991mostfm.co.id
-aanapa.ru
-abbanreddy.com
-abcdeg.xyz
-acunetix-referrer.com
-adamoads.com
-adbetclickin.pink
-addblueoff.com.ua
+12bet.com
+12u.info
+2nt.ru
+3th.co.in
+3xforum.ro
+51.la
+6128786.com
+83net.jp
+9med.net
+aa8780bb28a1de4eb5bff33c28a218a930.com
+aa8b68101d388c446389283820863176e7.com
+abclauncher.com
+absugars.com
+abwa.tk
+adclickservice.com
+admanaerofoil.com
 adprotect.net
-adsland.men
-adultfriendfinder.com
-advertex.info
-afslankpillen2017nl.eu
-agahinameh.com
-agreda.pluto.ro
-ahmedabadwebs.com
-albamargroup.com
-alborzan.com
-alfa9.com
-all4invest.info
-allcredits.su
-allwidewallpapers.com
-aloofly.com
-amateurlivechat.org
-analytics-ads.xyz
-animalrank.com
-animaltoplist.com
-anniemation.com
-apartmentbay.ru
-apartmentratings.com
-apidiamondatanet-a.akamaihd.net
-appartement-stumm.at
-appfastplay.com
-apps-analytics.net
-arenanews.com.ua
-arendatora.ru
-arpelsreplica.xyz
-asiengirls.net
-atelielembrancaqueencanta.com.br
-azartclub.org
-azte.ch
-babosas.com
-backgroundpictures.net
-baditri.com
-banksrf.ru
-beauty-b0x.pl
-bestchoice.cf
-bestwebsiteawards.com
-bet365.com
-beta.hotkeys.com
-bgviagrachrx.com
-bkns.vn
-blogig.org
+ads.gold
+adultfullhd.com
+adultwebhosting.info
+advancedmassagebysara.com
+advocatemsk.ru
+advokateg.xyz
+agapovdg.ru
+air-edem.ru
+alert-fjg.xyz
+alienwheels.de
+allbizne.co.ua
+allpdfmags.net
+allsilver925.co.il
+amateurgalls.com
+amateurmatch.com
+amehdaily.com
+amospalla.es
+amt-k.ru
+angel1777.kz
+animal-drawings.com
+anjalika.co.in
+apartment.ru
+apibetweenlinesn-a.akamaihd.net
+apiportalmorecom-a.akamaihd.net
+api.stathat.com
+apiwebwebgetcom-a.akamaihd.net
+appleid-verification.com
+arendovalka.xyz
+arvut.org
+asrvvv-a.akamaihd.net
+atley.eu.pn
+atofilms.com
+audiofree.ru
+autobrennero.it
+azbuka-mo.ru
+babieca.com
+bankcrediti.ru
+bankiem.pl
+battleforupdating.site
+bear.gotcher.us
+bedandbreakfast.com
+bestofpicture.com
+best-seo-software.xyz
+best-seo-solution.com
+bestsexyblog.com
+bigames.online
+biglistofwebsites.com
+bioinnovate.co
+biznesluxe.ru
+biznesrealnost.ru
+bjetjt.com
+bkgr.se
+blacktwhite.com
 bloke.com
-bmw-ark.ru
-boltalko.xyz
-brandbucket.com
+bluejays-jerseys.us
+bmwhighperformers.com
+brainxs.us
+brakehawk.com
+brateg.xyz
+break-the-chains.com
+breget74.ru
 brg8.com
-bristolhotel.com
-bristolhotel.com.ua
+bronzeaid-a.akamaihd.net
+brothers-smaller.ru
+budilneg.xyz
 buqayy0.livejournal.com
-bus-offer.com
-buyclomidonlaine.com
-c1.onedmp.com
-camdolls.com
-canvas.gloverid.site
-carapics.com
-carsdined.org
-cartierring.xyz
-castingbank.ru
-caveavins.fr
-cdnanalytics.xyz
-cheapbelstaff.online
-cheapmoncler.xyz
-check-host.net
-chee-by.biz
+butstrap.space
+buypanicdisorderpill.com
+buyparajumpers.online
+buypillsorderonline.com
+canrioloadm.gq
+cartierbracelet.xyz
+celejihad.info
+chatroulette.si
+cherrypointplace.ca
+chinaelitecheapjerseys.com
+choice-credit.ru
 choosecuisine.com
-cialischsrx.com
-cialisndbrx.com
-cialisovercounteratwalmartusa.com
-cleanallspyware.com
-cleanersoft.com
-cleanpcnow.com
-clean-start.net
-clean-virus-mac.com
-clicksor.net
-clknsee.com
-clksite.com
-com-cleaner.systems
-cometorussia.net
+christianlouboutinshoes.xyz
+cialiswithoutadoctor.net
+cicaki.net
+cinemaflix.website
+cleanmypc.com
+clickcash.com
+cocyq.inwtrade.com
+coindirect.io
+collegeessay19.blogspot.ru
 community.allhiphop.com
-compliance-elena.xyz
-compliance-margo.top
+compliance-alexa.xyz
+compliance-brian.xyz
+compliance-elena.top
+compliance-josh.top
+conboy.us
+connectionstrenth.com
 coolyarddecorations.com
-countercrazy.com
-courtshipgift.com
-creatives.adbetclickin.pink
-csgo4.win
-cypernhuset.se
-czat.wp.pl
-dbmkfhqk.bloger.index.hr
-deanmoore.ie
-decorationspcs.com
-dgfitness.co
-digitalassetmanagement.site
-dinkolove.ya.ru
-diusyawiga.tk
-dmmspy.com
-doctormakarova.ru
-documentsite.net
-dodlive.mil
-dogsrun.net
-domain.webkeyit.com
-domashneeruporno.com
+coprofam.org
+counciltally.com
+counter.yadro.ru
+creditmoney.com.ua
+custom-electric-guitar.com
+czeshop.info
+dailystrength.org
+damasarenai.info
+danceuniverse.ru
+daretodonate.co
+dawlenie.com
+ddsoldes.fr
+delfin-aqua.com.ua
+dellalimov.com
+detskie-konstruktory.ru
+detsky-nabytek.info
+diffbot.com
+discovertreasure-a.akamaihd.net
+divatraffic.com
+djstools.com
+dnepropetrovsk.mistr-x.org
+dogbreedspicture.net
+domaincheck.io
+doska-vsem.ru
 dostavka-v-ukrainu.ru
-dosugrostov.site
-dotnetdotcom.org
-downloaddy.net
+download-of-the-warez.blogspot.com
+download-wallpaper.net
 doyouknowtheword-flummox.ml
-dptaughtme.com
-drhomes.biz
-droidlook.net
+dprtb.com
 drugs-no-rx.info
-dstroy.su
-easycommerce.cf
-easytuningshop.ru
-easyukraine.com
-ecommerce-seo.com
-eduinfosite.com
-electricwheelchairsarea.com
-elektrischeziga.livejournal.com
-elektronischezigarettekaufen1.myblog.de
-elektrozigarette1.dreamwidth.org
-elektrozigarette2.webs.com
-elektrozigarette2.wordpressy.pl
-elektrozigaretten2.yn.lt
-elitepcgames.com
-erotikstories.ru
-eshop.md
-este-line.com.ua
-extractorandburner.com
-ezaz.info
-f00kclan.de
-f5mtrack.com
+dtm-spain.com
+dustyorate.com
+eas-seo.com
+easyshoppermac.com
+ec-file.info
+e-commerce-seo.com
+education-cz.ru
+ekspertmed.com
+elektrischezigarettekaufen2.cowblog.fr
+elektronischezigarette2.mex.tl
+elkacentr.ru
+eluxer.net
+energydiet24.ru
+energy-ua.com
+enge-fotzen.info
+eralph.tk
+essay-writing.work
+eupornstar.info
+exct.net
+exoclick.com
+eyessurgery.ru
+ezigaretteshop2.vefblog.net
+ezrvrentals.com
+f0815.de
 fakehandbags.xyz
-famix.xyz
-femmesdenudees.com
-filmbokep69.com
-findacheaplawyers.com
-firesub.pl
-flex4launch.ru
+fatfasts-4tmz.com
+fenoyl.batcave.net
+fickkontaktehobbyhuren.com
+fillmewithhappiness.com
+finemanteam.com
+f-loaded.de
 floridamobilebillboards.com
-flowersbazar.com
-forexgb.ru
-forex-indextop20.ru
-formularz-konkurs.tk
-fotzen-ficken.com
-freelinkbuilding.website.tk
-free-today.com
-fuck-paid-share-buttons.xyz
-futbolkisales.ru
-gameprimary.com
-game-top.su
-gateway.zscalertwo.net
-gazobeton-p.com.ua
-gaz-voshod.ru
-gdebestkupit.ru
-gearsadspromo.club
-genetworx.com
-gerhardhealer.com
-ggiaro.com
-gheus.altervista.org
-ghostvisitor.com
-glall.ru
-gratis-sexkontakte.com
-gratuitxblcodes.com
-greendream.com.ua
-grtyi.com
-grupografico-pilar.com.ar
-gsmtlf.ru
-guigyverpo.cf
-gyffu.com
-hannasolution.ru
-hauleddes.com
-hawaiielectriclight.com
-hdapp1008-a.akamaihd.net
-hdxnxxtube.mobi
+foxydeal.com
+fr-bearings.ru
+free411games.com
+freemaintenancesysforpcandmac.top
+fsalas.com
+fuel-gas.com
+funtoonez.com
+fz139.ttk.ru
+galaxys6manual.info
+games.kolossale.ru
+garciniaxt.us
+gay-file.com
+gaygalls.net
+gigablast.com
+glogow.pl
+goodhumor24.com
+gowreckdiving.com
+gsasearchenginerankerhelp.com
+guarrasdelporno.xxx
+guitar-master.org
+hao123.com
+hard-porn.mobi
+hayate.biz
+hcate.com
 healgastro.com
-hermesbracelets.xyz
-histats.com
+heartofbeijing.blogspot.com
+hesteel.pl
+himazin.info
+himgaws.pw
 historichometeam.com
-hkladys.com
-hobbyhuren-datenbank.com
-hop.clickbank.net
-host-tracker.com
-hotshoppymac.com
-house.sieraddns.com
-hoverboard360.nl
-hoverboard360.se
-hoztorg-opt.ru
-igadgetsworld.com
-imk.com.ua
-immobiliaremassaro.com
-imperiafilm.ru
-impisr.edunsk.ru
-inbabes.sexushost.com
-internetproviderstucson.com
-ivoiretechnocom.ci
-izhevsk.zrus.org
-j33x.com
-jav-way.site
-jeremyeaton.co
+homeandhealth.ru
+homedo.fabpage.com
+hoste.octopis.com
+hotkeys.com
+houston-vikings.com
+howtoclean.club
+hvd-store.com
+iamsport.org
+ideoworld.org
+ikritikimou.gr
+ilte.info
+imadedinner.net
+imagefinder.site
+imagerydatabase.com
+imguramx.pw
+incest-ru.com
+indo-export.ru
+inome.com.ua
+intellego.info
+interesnie-faktu.ru
+internet-apteka.ru
+intim-uslugi.info
+ipchicken.com
+iqoption.pro
+irkutsk.online-podarki.com
+i-service.kz
+isistaylorporn.info
+isotoner.com
+isoveti.ru
+itsdp3.com
+izoll.ru
+javxxx18.com
 jerseychinabizwholesale.us
-jillepille.com
-journalhome.com
-j-times.ru
-justprofit.xyz
-kakadu-interior.com.ua
-kamen-e.ru
-kartiniresto.com
-ketoanhanoi.info
-khafre.us
-kino-filmi.com
-kinogolos.ru
-kinohit1.ru
-kinostorm.net
-kliksaya.com
+journeydownthescale.info
+kabbalah-red-bracelets.com
+kazka.ru
+kino2018.club
+kinosed.net
+klitimg.pw
 kochanelli.com
-komputernaya-pomosh-moscow.ru
-konpax.com
-kupiproday.com.ua
-kurwa.win
-kutikomi.net
-kwzf.net
-labvis.host.sk
-laparfumotec.com
-lennatin.info
-letmacworkfaster.site
-letmacwork.world
+krasnodar-avtolombards.ru
+ktotut.net
+labelwater.se
+landreferat.ru
+larger.io
+lego4x4.ru
 lezbiyanki.net
-life-instyle.com
-livefixer.com
-lkbennettoutlet.online
-llastbuy.ru
-lotto6888.com
+lflash.ru
+liky.co.ua
+live-cam6.info
+lkbennettstore.online
+locatellicorretor.com.br
+lostaruban.com
 low-format.ru
-lunamedia.co
-mackeeper-land-672695126.us-east-1.elb.amazonaws.com
-macresource.co.uk
-madot.onlinewebshop.net
-mafa-free.com
-mafcards.ru
-magicalfind-a.akamaihd.net
-malls.com
-marblestyle.ru
-massage-info.nl
-matrixalchemy.com
-mebelcomplekt.ru
-meble-bogart.info
-meccadumps.net
+lyrics.home-task.com
+macfix.life
+mackeeper-center.club
+macnewtech.com
+mainlinehobby.net
+makis.nu
+manipulyator-peterburg.ru
+mantramusic.ru
+marktforschung-stuttgart.com
+mebel-alait.ru
+meetingrainstorm.bid
+megaapteka.ru
 megahdporno.net
-mini.7zap.com
-mir-limuzinov.ru
-mlvc4zzw.space
-mmoguider.ru
-mobioffertrck.com
-mockupui.com
-moesen-ficken.com
-moetomnenie.com
-moi-glazki.ru
-mole.pluto.ro
-monclerboots.xyz
-monetizer.com-01.site
-money-for-placing-articles.com
-moneyzzz.ru
-montazhnic.ru
-mossmesi.com
-most.gov.iq
-movies-in-theaters.net
-moz.com
-mturkcontent.com
-musicspire.online
-mustwineblog.com
-mxgetcode.com
+metascephe.com
+mex-annushka.ru
+mexicotravelnet.com
+michaelkorssaleoutletonline.net
+minharevisao.com
+miniature.io
+mirmedinfo.ru
+missclub.info
+mistr-x.org
+mjchamonix.org
+mobilemedia.md
+moneyviking-a.akamaihd.net
+moskva.nodup.ru
+mwtpludn.review
+my-bc.ru
+mydownloadengine.com
 mygameplus.ru
-mylida.org
-nakozhe.com
-narkologiya-orel.ru
-narkologiya-penza.ru
-nbsproject.ru
-newstudio.tv
-nhl17coinsforps3.gratisblog.biz
-nlfjjunb5.ru
+nerudlogistik.ru
+netcheckcdn.xyz
+netvouz.com
+njkmznnb.ru
+nl.netlog.com
 nofreezingmac.click
-noscrapleftbehind.co
-novosti-hi-tech.ru
-nudo.ca
-offers.bycontext.com
-offf.info
-officedocuments.net
-oklogistic.ru
-o.light.d0t.ru
-onemantrip.com
-online-hit.info
-openfrost.com
-orgasmus-virtual.com
-pandroid.co
-park.above.com
-partner-cdn.men
-partnersafe.men
-pdns.download
-photokitchendesign.com
-photostudiolightings.com
-picphotos.net
-picsearch.com
-pics-group.com
-picturesboss.com
-pila.pl
-pixgood.com
-pizdopletka.club
-platezhka.net
-playfortuna-play.ru
-pokerniydom.ru
-polytopesexempt.com
-popserve.adscpm.net
-poquoson.org
+nofreezingmac.work
+obsessionphrases.com
+oconto.ru
+odywpjtw.bloger.index.hr
+offergroup.info
+offside2.5v.pl
+okuos.com
+one-gear.com
+online247.ml
+ons-add.men
+ontargetseo.us
+ooo-gotovie.ru
+optibuymac.com
+orenburg-gsm.ru
+orhonit.com
+ossmalta.com
+ostrovtaxi.ru
+paleohub.info
+parajumpersjakkesalgnorge.info
+parfusale.se
+partner-high.men
+pay2me.pl
+percin.biz.ly
+perfection-pleasure.ru
+physfunc.ru
+picscout.com
+picture-group.com
+pigrafix.at
+pixelrz.com
+plastweb.ru
+plusnetwork.com
+pobeiranie.pl
+poiskzakona.ru
+popander.mobi
 porngalleries.top
-pornhive.org
-porno-chaman.info
-pornodojd.ru
-pornokorol.com
-porno-video-chati.ru
-praisong.net
-prchecker.info
-printie.com
-priora-2.com
-privetsochi.ru
-prizeestates.cricket
-productarium.com
-profitfx.online
-proftests.net
-propranolol40mg.blogspot.com
-prospekt-st.ru
-prostitutki-belgoroda.org
-pst2017.onlinewebshop.net
-purplestats.com
-push-ad.com
-q-moto.ru
-qpypcx.com
-quickbuck.com
-quickchange.cc
-quizzitch.net
-ranksonic.info
-rapidokbrain.com
-rapidsites.pro
-referencemoi.com
-remont-mobile-phones.ru
-remont-ustanovka-tehniki.ru
-responsinator.com
-richinvestmonitor.com
-rimedia.org
-roofers.org.uk
-rus-pornuha.com
-safe-app.net
-samolet.fr
-sampleletters.net
-sbtdesign.co.uk
-scanner-alex.top
-screentoolkit.com
-searchaddis.com
-searchencrypt.com
-searchkut.com
-seksotur.ru
-semrush.com
-senger.atspace.co.uk
-serviporno.com
-sex-dating.co
-sexkontakte-seite.com
-sexobzor.info
-sexpornotales.com
-sfj-ror.no
-sharpchallenge.com
-shiksabd.com
-shoppingmiracles.co.uk
-sibecoprom.ru
-sildenafil-tadalafil.info
+pornofiljmi.com
+pornogratisdiario.com
+pornozhara.com
+porn-w.org
+pospr.waw.pl
+pozvonim.com
+privatbank46.ru
+prizefestival.mobi
+prizestohandle.club
+proekt-mos.ru
+prostitutki-tolyatti.org
+pufip.com
+puserving.com
+putitin.me
+quebec-bin.com
+quickcashlimited.com
+ranksonic.com
+razamicroelectronics.com
+redbottomheels.xyz
+refads.pro
+rixpix.ru
+rubanners.com
+rubbed.us
+sajatvelemeny.com
+sakhboard.ru
+salmonfishingsacramentoriver.com
+samara.rosfirm.ru
+santechnik.jimdo.com
+sawin.beth.webd.pl
+sbetodiodnye-lampy.ru
+scanner-jane.top
+scanner-julia.top
+search.alot.com
+searchinquire.com
+seofied.com
+seojokes.net
+seo-platform.com
+seo-tools-optimizing.com
+service.adtech.fr
+sexcamamateurchat.com
+sexgalleries.top
+sexiporno.net
+sexkrasivo.net
+sexs-foto.com
+sex-tracker.de
+sexyali.com
+sfd-chess.ru
+shakhtar-doneck.ru
+sharebutton.org
+share-buttons-for-free.com
+silverage.ru
 simple-share-buttons.com
-sirpornogratis.xxx
-site-speed-checker.site
-sivs.ru
-skuteczna-dieta.co.pl
-sky-mine.ru
-smokewithrabbits.com
-soc-econom-problems.ru
-socialseet.ru
-sohoindia.net
+sitebeam.net
+skanninge.se
+skutecznetabletkinaporostwlosow.pl
+sluganarodu.ru
+sobecjvuwa.com.ru
+socas.pluto.ro
+soda.media
+softlinesolutions.me
+solution4u.com
 sonata-arctica.wz.cz
-spammen.de
-speedup-my.site
-spin2016.cf
-sportbetfair.com
-sports-supplements.us
-sstroy44.ru
-stockquotes.wooeb.com
-suggest-keywords.com
-supernew.org
-susanholtphotography.com
-svarkagid.com
-swimpool.ca
-symphonyintegratedhealthcare.com
-syndicate.fun
-tabletkinaodchudzanie.com.pl
-taihouse.ru
+space4updating.win
+spravka-medosmotr.ru
+spylog.com
+sribno.net
+statoutlook.info
+stop-gepatit.te.ua
+strongsignal-a.akamaihd.net
+surcentro.com
+surfbuyermac.com
+suture.co
+swinger-mobil.net
+tanieaukcje.com.pl
+tattomedia.com
 tedxrj.com
-template-kid.com
-thebestweightlosspills.ovh
-thebluffs.com
-timecrimea.ru
-tizanidine4mguses.blogspot.com
-tizanidineandgabapentin.blogspot.com
-tizanidinedosageforsleep.blogspot.com
-tizanidineusedfor.blogspot.com
-tksn.ru
-tooplay.com
+telemetryverification.net
+theautoprofit.ml
+thefds.net
+thegameriders.com
+thenews-today.info
+thepokertimer.com
+timeallnews.ru
+tizanidine4mgstreetvalue.blogspot.com
+tizanidinecost.blogspot.com
+tizanidineshowupondrugtest.blogspot.com
+tkanorganizma.ru
+tk-assortiment.ru
 top10registrycleaners.com
-top10-way.com
-toproadrunner5.info
-totu.us
 tovaroboom.vast.ru
-trailer.cinemaflix.website
-tuberkuleznik.ru
-tvoystartup.ru
-typer.one
-ultimatesetnewfreeallsoftupgradesystems.pw
+toyota.7zap.com
+trackmedia101.com
+trafficnetzwerk.de
+trion.od.ua
+try-rx.com
+tuckermktg.com
+tvnewsclips.info
+typimga.pw
+tytoona.com
+ucsol.ru
+uggbootsoutletsale.us
+ugogo.info
+uhdtv.website
+uhod-za-sobakoj.ru
 universals.com.ua
-usadacha.net
-ustion.ru
-v720hd.ru
+uptime-alpha.net
+uptimechecker.com
+urengoy.pro
+urlcut.ru
+uroki.net
 vapeface.club
-vereo.eu
-viandpet.com
-videochat.tv.br
-videokrik.net
-video--production.com
-vip2ch.com
-vip.51.la
-vitalads.net
-voltrknc1.com
-voluumtrk.com
-voronezh.xrus.org
-vremya.eu
-w7s.ru
+vgoloveboli.net
+viagraneggrx.com
+viagra-soft.ru
+videojam.tv
+videooko.weebly.com
+videospornogratisx.net
+videotuber.ru
+viven.host.sk
+vriel.batcave.net
+vrnelectro.ru
+vysigy.su
+wallpapers-best.com
+watch-movies.ru
 watsonrealtycorp.com
-web-betting.ru
-website-speed-check.site
+waycash.net
+waysbetter.cn
+wdfdocando.com
+webads.co.nz
 weclipart.com
-wedding-salon.net
-wejdz-tu.pl
-westermarkanjou.se
-whiteelephantwellington.com
-whos.amung.us
-woman-tampon.ru
-womensterritory.ru
-workle.website
-wrona.it
-ww1943.ru
-x5market.ru
-xboxster.ru
-xedserver.com
-xev.ru
-xingzi-vision.com
-xjrul.com
-xn--hxazdsfy.blogspot.com
-xn--l1aengat.xn--p1ai
-x-porno.video
-xuki.us
-xxxtubesafari.com
-yellowstonesafaritours.com
-youdesigner.kz
-youradulthosting.com
-yousense.info
-youthreaders.com
-zarabiaj-dzis.pl
-zatjmuzu.info
-zerocash.msk.ru
-zone-kev717.info
-zoominfo.com
-zscalertwo.net
-zverokruh-shop.cz
-zytpirwai.net
+weekes.biz.tc
+wesharepics.site
+wieseversa.no
+wikes.20fr.com
+winner7777.net
+wnhjavlhezp.gq
+wordpress-crew.net
+writingservices17.blogspot.ru
+wufak.com
+wwwadultcheck.com
+xaylapdiendanang.com
+xchat26.myfreecams.com
+xclicks.net
+xlolitka.com
+xn-----6kcaabbafhu7cskl7akvongwpo7hvjj.xn--p1ai
+xn-----6kcaacnblni5c5bicdpcmficy.xn--p1ai
+xn----7sbahjd3btneuw1joc.xn--p1ai
+xn----7sbbahaq9bb5afgiqfliv4m.xn--p1ai
+xn--80aaagvmjabrs1aoc9luc.xn--p1ai
+xn--80aeahghtf8ac5i.xn--p1ai
+xn-----8kcatubaocd1bneepefojs1h2e.xn--p1ai
+xn--c1acygb.xn--p1ai
+xn--e1afanlbnfckd7c3d.xn--p1ai
+yhit.press
+yopoint.in
+yougetsignal.com
+yougotanewdomain.com
+your-bearings.com
+youtoner.it
+zakon-ob-obrazovanii.ru
+zeg-distribution.com
+zeroredirect2.com
+zeroredirect6.com
+zetmaster.ru
+zigarettenonlinekaufen2.drupalgardens.com
+zigarettenonlinekaufen.tumblr.com
+znakomstvaonlain.ru
+zoodrawings.com
+zoogdiesney.com
+zryydi.com
+zzlgxh.com
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 f71e22271..1b107e4dc 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 @@
-03p.info
-101raccoon.ru
-11pikachu.ru
-12masterov.com
-1j7740kd.website
-1kinobig.ru
-1millionusd.xyz
-4replicawatch.net
-acheterviagrafr24.com
-adservme.com
-adtech.fr
-affiliate-fr.com
-agardomains.com
-ahmedabadwebs.com
-albumsuper.info
-alevinefesleri.com
-aliexpress.com
-amigobulls.com
-an-donut.com
-animalrank.com
-anlimebel.kiev.ua
-apps-analytics.net
-arcteryxstore.online
-arenda-avtoprokat-krasnodar.ru
-artefakct.com
-asophoto.com
-auspolice.com
-aviav.ru.com
-awaybird.ru
-backlinkwatch.com
-bagcionderlab.com
-bagsonsale.online
-baksman.com
-beauty-bracelet.com
-belinvestdom.by
-bestpriceninja.com
-bestssaker.com
-bg6s0.com
-bharatdefencekavach.com
-bigcities.org
-bizlist.com.de
-blobar.org
-blog.f00kclan.de
-blog.koreadaily.com
-bocoarchives.org
-b-styles.xyz
-bycontext.com
-cartierlovebracelet.xyz
-cerev.info
-chocolateslim-en-france.com
-citysecurity.nu
-cognitiveseo.com
-colobit.biz
-compliance-alex.top
-concordexoticrentals.com
-connectionstrenth.com
-coolgamechannel.com
-csgo4.win
-cubs-jerseys.us
-dktr.ru
-dlya-android.org
-dnsrsearch.com
-draniki.org
-eugenevaultstorage.com
-ezigaretteshop.webs.com
-fealq.com
-fefo.gdn
-fertilitetsradgivningen.se
-fillmewithhappiness.com
-financepoints.eu
-financetip.eu
-finteks.ru
-footballfarrago.com
+1001watch.com.ua
+101lesbian.xyz
+273-fz.ru
+7makemoneyonline.com
+aa14ab57a3339c4064bd9ae6fad7495b5f.com
+aasoldes.fr
+adtech.us
+advertisingtag.net
+airmaxshoes-2016.com
+alert-jdh.xyz
+alfapro.ru
+alive-ua.com
+all4invest.ru
+apibetweenlinesn-a.akamaihd.net
+appsecurityr.com
+autodo.info
+autoplate.info
+autoseo-traffic.com
+autotrends.today
+awency.com
+azbukadiets.ru
+bashtime.ru
+battlecarnival.su
+becuo.com
+best-deals-products.com
+bigcareer.info
+bin-brokers.com
+blackle.com
+bluesman.nu
+buybest1.biz
+buy-cheap-pills-order-online.com
+buzzzg.men
+cacheimages.com
+call-of-duty.info
+camel-beach.com
+canoncdriverq3.pen.io
+carabela.com.do
+cardsdumps.com
+cartierreplica.win
+cezartabac.ro
+cheapjerseysap.com
+civilwartheater.com
+cjmc.info
+cleanpcnow.com
+conocer-sanabria.com
+coop-gamers.ru
+copro.pw
+copyrightclaims.org
+counciltally.com
+creditmoney.com.ua
+diesel-parts28.ru
+divisioncore.com
+dogoimage.com
+dogsrun.net
+dojki-hd.com
+domik-derevne.ru
+doska-vsem.ru
+dostavka-v-ukrainu.ru
+dverimegapolis.ru
+eaplay.ru
+e-avon.ru
+e-collantes.com
+ee77ee.com
+efnor-ac.com
+elektrozigarette1.dreamwidth.org
+elektrozigarettekaufen1.devhub.com
+encodable.com
+englate.com
+ezb.elvenmachine.com
+findclan.org
+flowwwers.com
 forpostlock.ru
-fotopop.club
-frameimage.org
-front.to
-funnel.co.za
-gameonasia.com
-gilsonchiro.xyz
-globatur.ru
-golaya.pw
+forsex.info
+free-social-buttons.com
+free-today.com
+free-traffic.xyz
+golmau.host.sk
 gonextmedia.com
-gratuitxblcodes.com
-gsou.cf
-guiadeserraazul.com
-guruofcasino.com
-gwebtools.com.br
-gwhwpxbw.bloger.index.hr
-hanink.biz.ly
-headpharmacy.com
-heatpower.ru
+graphics8.info
+gratis-sexkontakte.com
+gsbs.com.ua
+gta-top.ru
+guigyverpo.cf
+hdxnxxtube.mobi
+healmytrauma.info
 hidefiles.org
-host-tracker.com
-hoverboard360.se
-howopen.ru
-htmlcorner.com
-hyipmanager.in
-ibb.com.ua
-ico.re
-imabase.com
-iqoption.pro
-isistaylorporn.info
-iweblist.info
-javidol.site
-jerseysbizwholesalecheap.com
-kareliatobacco.ru
-kashubadesign.ru
-kasino-money.pw
-keywordsking.com
-keyword-suggestions.com
-kfon.eu
-kino-fun.ru
-kochanelli.com
-kongoultry.net
-kountrylife.com
-krafte.ru
-lalalove.ru
-landinez.co
-law-check-nine.xyz
-lawyers.cafe
-linkdebrideur.xyz
-liumimgx.pw
-live-cam6.info
-live-sexchat.ru
-ljusihus.se
-mabdoola.blogspot.com
-maladot.com
-marcoislandvacations.net
-mathgym.com.au
-mature.free-websites.com
-maxthon.com
-medkritika.ru
-meetlocalchicks.com
-meltwater.com
-metarip.ru
-minecraft-rus.org
-minyetki.ru
-mobilemedia.md
-monarhs.info
-moneyteam24.com
-morefastermac.trade
-morpicert.pw
-moviemail-online.co.uk
-mrbojikobi4.biz
-musezone.su
-mustat.com
-mycouponizemac.com
-mypornfree.ru
-nagdak.ru
-naperehresti.info
-narosty.com
+hoholikik.club
+hostsshop.ru
+hotel-mkad.ru
+hotkeys.com
+hoztorg-opt.ru
+humbmosquina.tk
+hut1.ru
+ie.57883.net
+increasewwwtraffic.info
+intim-uslugi.info
+istmira.ru
+iwantmyfreecash.com
+jikoman.info
+jmat.cn
+job.icivil.ir
+juliadiets.com
+kaliningrad.zrus.org
+keywords-monitoring-your-success.com
+khafre.us
+konturkrasoty.ru
+labafydjxa.su
+laptoper.net
+lazymanyoga.com
+letmacworkfaster.world
+lida-ru.com
+lignofix.ua
+link.ac
+livejasmin.com
+locatellicorretor.com.br
+longadventure.com
+lostfilm-online.ru
+lovelycraftyhome.com
+mansparskats.com
+max-eclat.men
+max-p.men
+megaapteka.ru
+midst.eu
+mini.7zap.com
+miniature.io
+moesonce.com
+mostantikor.ru
+mp3films.ru
+mrsdalloways.com
+msfsaar.de
+mydeathspace.com
+myprintscreen.com
+myxdate.info
 navalwiki.info
-nextrent-crimea.ru
-ningessaybe.me
-no-fuel.org
-okeinfo.online
-oklogistic.ru
-okout.ru
-olgacvetmet.com
-o.light.d0t.ru
-onlinedomains.ru
-onthemarch.co
-osagonline.ru
-patol01.pw
+november-lax.com
+novosti-hi-tech.ru
+nuup.info
+oakridgemo.com
+oecnhs.info
+omoikiri-japan.ru
+oren-cats.ru
+orsonet.ru
+pandroid.co
+paperwritingservice17.blogspot.ru
 pb-dv.ru
-perfection-pleasure.ru
-pornolook.net
-porno-raskazy.ru
-pornosexrolik.com
-profitwithalex.info
-pssucai.info
-pussyspace.net
-realnye-otzyvy.info
-renewablewealth.com
-revistaindustria.com
-rialp.getenjoyment.net
-roofers.org.uk
-royalvegascasino.com
-rutor.vip
-scoopquest.com
-scopich.com
-seansonline24.pl
-seksotur.ru
-semalt.com
-seorussian.ru
-sevenstars7.com
-sexkontakteao.info
-shodanhq.com
-shop.acim.org
-siteaero.com
-sitevalued.com
-sivs.ru
-sodexo.com
+picscout.com
+pijoto.net
+pinsdaddy.com
+pinstake.com
+pipki.r.acdnpro.com
+plaff-go.ru
+pogodnyyeavarii.gq
+poiskzakona.ru
+polimga.pw
+popserve.adscpm.net
+pornhubforum.tk
+pornofeuer.com
+porto.abuilder.net
+powitania.pl
+pp-budpostach.com.ua
+printie.com
+prize44.com
+proekt-gaz.ru
+pro-okis.ru
+prosmibank.ru
+pulse33.ru
+putitin.me
+rainbowice.ru
+rankings-analytics.com
+rebuildermedical.com
+redirlock.com
+reeyanaturopathy.com
+regdefense.com
+rentalcarnavi.info
+research.ifmo.ru
+responsive-test.net
+rixpix.ru
+rootandroid.org
+royal-betting.net
+rubanners.com
+rumamba.com
+runofilms.ru
+rvtv.ru
+saltspray.ru
+sape.top
+sbwealthsolutions.ca
+scalerite.co.za
+scanner-nelson.top
+scanspyware.net
+seokicks.de
+sexad.net
+sextracker.be
+sharebutton.org
+shmetall.com.ua
+shoppingjequiti.com.br
+shtaketniki.ru
+slim.sellany.ru
 spaceshipad.com
-spb.afora.ru
-sportbetfair.com
-stairliftsarea.com
-stjamesschool.info
-stroyplus.ru
-sudexpert66.ru
-superfish.com
-sweepstakes.rewardit.com
-swsociety.se
-taaaak.com
-takeprofitsystem.com
-tattomedia.com
+standardchartered-forex.com
+stroydetali.ru
+symbaloo.com
+szamponrevita.pl
+tacbelarus.ru
+t-bygg.com
 tds-advert005.info
-thaisamkok.com
-thenetinfo.com
-thetoiletpaper.com
+tdsing.ru
+teslathemes.com
 titslove.yopoint.in
-tizanidinehydrochloride2mg.blogspot.com
-top1-seo-service.com
-tourcroatia.co.uk
-track112.site
-traffique.net
+tizanidineandhydrocodone.blogspot.com
+tizanidinehcl4mgtabinfo.blogspot.com
+torrents-tracker.com
+traffixer.com
+traffmonster.info
+traxdom.ru
+trkdf.com
+tuberkuleznik.ru
 tupper-posuda.ru
-turn-up-life.life
-udayavani.com
-via-energy-cumpara.com
-viagengrarx.com
-videochat.mx
-videtubs.pl
-viel.su
-vipps.com.my
-vkmusics.ru
-vkonche.com
-vmnmvzsmn.over-blog.com
-vremya.eu
-vsexkontakte.net
-vut.com.ru
-webextract.profound.net
-westen-v.life
-wineration.com
-wordkeyhelper.com
-word-vorlagen.xyz
-www.888.com
-xcc24.pl
-xn----9sbubg3ambdfl1j.xn--p1ai
-xxart.ru
-youjizz.vc
-youresponsive.com
-yousense.info
-ypmuseum.ru
-yun56.co
-zojirushi-products.ru
-zoolubimets.ru
-zoompegs.com
-zscalerone.net
+ultramart.biz
+unece.org
+unpredictable.ga
+uvozdeckych.info
+vclicks.net
+vektorpress.ru
+veopornogratis.xxx
+viagraneggrx.com
+videochat.ph
+videojam.tv
+video--production.com
+vipms.ru
+vita.com.hr
+w3data.co
+webalan.ru
+website-audit.com.ua
+website-speed-up.site
+weclipart.com
+wineitudes.wordpress.com
+wormix-cheats.ru
+woweb.com.ua
+xcombear.ru
+x-diesel.biz
+xfire.com
+xfluro.com
+xn-----6kcaacnblni5c5bicdpcmficy.xn--p1ai
+xn----7sbahjd3btneuw1joc.xn--p1ai
+xn----ctbigni3aj4h.xn--p1ai
+xn--lifehacer-1rb.com
+yougame.biz
+yougetsignal.com
+zeroredirect11.com
+zzbroya.com.ua
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index f371d9e5f..a7215fb74 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,21 +1,11 @@
-<!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>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.14.2</center>
 </body>
 </html>
-<html>
+l>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -126,4 +116,14 @@
 <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/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 550592aeb..fcf8d6f24 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 8452b571b..22c219c51 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 5430e93de..0464c73b2 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1736
+#### Version: V4.2019.07.1737
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index dd1af8e35..3049ff249 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1736
+#### Version: V4.2019.07.1737
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index 45da3b965..d9d6997c8 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 from ever reaching your web sites. [PLEASE SEE: Definition of Bad Bots](#define-bad-bots)
 
 _______________
-#### Version: V4.2019.07.1736
+#### Version: V4.2019.07.1737
 #### Bad Referrer Count: [6717](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad Bot Count: [556](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 ____________________
diff --git a/_google_analytics_ghost_spam/README.md b/_google_analytics_ghost_spam/README.md
index 0f74ac5f2..287cd9cca 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.2019.07.1736
+#### Version: V4.2019.07.1737
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
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 f364dd6ae..dfa93cc82 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.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist-testing-version.conf b/conf.d/globalblacklist-testing-version.conf
index 827f63536..82df86221 100644
--- a/conf.d/globalblacklist-testing-version.conf
+++ b/conf.d/globalblacklist-testing-version.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1736
-### Updated: Tue Jul  2 14:24:37 SAST 2019
+### Version: V3.2019.07.1737
+### Updated: Tue Jul  2 14:42:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index f364dd6ae..dfa93cc82 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1736
-### Updated: Tue Jul  2 14:24:36 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index b1c0f3028..a24a2e1b0 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1736
-### Updated: Tue Jul  2 14:24:38 SAST 2019
+### Version: V4.2019.07.1737
+### Updated: Tue Jul  2 14:42:12 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##