diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index 0053b6810..827f63536 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.1735
-### Updated: Tue Jul  2 14:04:34 SAST 2019
+### Version: V3.2019.07.1736
+### Updated: Tue Jul  2 14:24:37 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 12f18b91b..90fe4f9d3 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.202.145.110	1;
+104.154.120.187	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 c3c284efc..bc389ee32 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.202.145.110	0;
+104.154.120.187	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 0053b6810..827f63536 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.1735
-### Updated: Tue Jul  2 14:04:34 SAST 2019
+### Version: V3.2019.07.1736
+### Updated: Tue Jul  2 14:24:37 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 12f18b91b..90fe4f9d3 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.202.145.110	1;
+104.154.120.187	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 c3c284efc..bc389ee32 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.202.145.110	0;
+104.154.120.187	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 0053b6810..827f63536 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.1735
-### Updated: Tue Jul  2 14:04:34 SAST 2019
+### Version: V3.2019.07.1736
+### Updated: Tue Jul  2 14:24:37 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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 12f18b91b..90fe4f9d3 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.202.145.110	1;
+104.154.120.187	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 c3c284efc..bc389ee32 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.202.145.110	0;
+104.154.120.187	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 0053b6810..827f63536 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.1735
-### Updated: Tue Jul  2 14:04:34 SAST 2019
+### Version: V3.2019.07.1736
+### Updated: Tue Jul  2 14:24:37 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 0053b6810..827f63536 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1735
-### Updated: Tue Jul  2 14:04:34 SAST 2019
+### Version: V3.2019.07.1736
+### Updated: Tue Jul  2 14:24:37 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index 2f63d0f6c..f364dd6ae 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 727440f92..0269e0f9d 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 f9f52b242..ec2d08a7e 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 2cd15a5e8..39ebf8b12 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 91e42818f..c74fb95c3 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 83ef1968e..611a4a6b3 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 3718ee2c8..c6314e548 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 727440f92..0269e0f9d 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 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 2f63d0f6c..f364dd6ae 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 42c86bb7d..746c3f03f 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.193.7.13	1;
+35.224.112.202	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 e42e64139..500584a94 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.193.7.13	0;
+35.224.112.202	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 2f63d0f6c..f364dd6ae 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 42c86bb7d..746c3f03f 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.193.7.13	1;
+35.224.112.202	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 e42e64139..500584a94 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.193.7.13	0;
+35.224.112.202	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 2f63d0f6c..f364dd6ae 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 42c86bb7d..746c3f03f 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.193.7.13	1;
+35.224.112.202	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 e42e64139..500584a94 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.193.7.13	0;
+35.224.112.202	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 2f63d0f6c..f364dd6ae 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 deb2992bb..6c3474a02 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +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.202.145.110          0;
+104.154.120.187         0;
+35.184.96.71            0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index eb182e280..86d7efe35 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 2e9ecfbe5..e24752400 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,6 +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.193.7.13             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 2f63d0f6c..f364dd6ae 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 a89940416..e7fdfcf45 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -46,5 +46,5 @@
 # - 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.224.112.202          0;
+35.184.96.71            0;
 104.154.120.187         0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index 2f63d0f6c..f364dd6ae 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 12f18b91b..90fe4f9d3 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	1;
+104.154.120.187	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 ebc3bec08..1e440af25 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 @@
-Evil
-Hloader
-Intelliseek
-Nettrack
-Nmap
-SBIder
-T8Abot
-Web Fuck
-Who.is Bot
-ZyBorg
+DomainSigmaCrawler
+Express WebPictures
+Grabber
+InfoNaviRobot
+JustView
+Kozmosbot
+Nessus
+Net Vampire
+WebmasterWorldForumBot
+WebReaper
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index 446c44b04..5c186dab3 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
+404checker
 404enemy
 80legs
+Abonti
 Aboundex
+Aboundexbot
+Acunetix
 ADmantX
-AiHitBot
-Aipbot
+AfD-Verbotsverfahren
 AllSubmitter
-AlphaBot
-Anarchie
 archive.org_bot
+Attach
 autoemailspider
 BackDoorBot
 Backlink-Ceck
-backlink-check
-BacklinkCrawler
 BackWeb
 Badass
-Battleztar Bazinga
+Bandit
+Barkrowler
+BatchFTP
 BDFetch
-BlackWidow
-Bolt
+BetaBot
 BotALot
+Brandprotect
 Buddy
-BuiltWith
+BuiltBotTough
 Bullseye
 BunnySlippers
-BuzzSumo
-CCBot
+CATExplorador
+CazoodleBot
 Cegbfeieh
 CheeseBot
 CherryPicker
-Claritybot
-Cloud mapping
+Cliqzbot
 coccocbot-web
 Collector
-Copier
-CopyRightCheck
-Copyscape
-Cosmos
-crawl.sogou.com
+com.plumanalytics
+crawler4j
+crawler.feedback
 CrazyWebCrawler
+Crescent
 CrunchBot
-CSHttp
 Curious
-DBLBot
-Deusu
+demandbase-bot
 Devil
-DigitalPebble
+Dirbuster
 Disco
-Discobot
+Dispatch
 DittoSpyder
 DnyzBot
-DomainAppender
-DomainSigmaCrawler
+DomainCrawler
 DomainStatsBot
-Dotbot
+Download Wonder
 Dragonfly
+Drip
 DSearch
+DTS Agent
+ECCP/1.0
 Ecxi
-EMail Siphon
-Exabot
+EirGrabber
+evc-batch
 Express WebPictures
 ExtLinksBot
+Extractor
+ExtractorPro
+Extreme Picture Finder
 EyeNetIE
 Ezooms
-FemtosearchBot
-FlashGet
+FDM
+Fimap
+Flunky
 Foobot
-GalaxyBot
+FrontPage
+FyberSpider
+Genieo
 GermCrawler
-GetRight
+Getintent
 Gigablast
-Go-Ahead-Got-It
+G-i-g-a-b-o-t
+Gotit
+Go!Zilla
 GrabNet
+GrapeFX
 GrapeshotCrawler
 HaosouSpider
 Harvest
-Havij
+HEADMasterSEO
 Heritrix
 Hloader
 HMView
+HTTrack
+Humanlinks
 HybridBot
+Iblog
+IDBot
+Image Fetch
 Image Sucker
-InfoTekies
-instabid
-Intelliseek
-InterGET
-InternetSeer
-IRLbot
-Jbrofuzz
+InfoNaviRobot
+IstellaBot
+JamesBOT
 JetCar
-Jetty
-JOC Web Spider
-Kenjin Spider
+Jorgee
+Jyxobot
 Keyword Density
-Kozmosbot
-LeechFTP
-LeechGet
+Larbin
+LexiBot
 Lftp
-Libwhisker
-Likse
+LibWeb
 Linkdexbot
-LinkextractorPro
-LinksManager
-LinqiaRSSBot
+LinqiaMetadataDownloaderBot
 LinqiaScrapeBot
 Lipperhey
-Litemage_walker
+Lipperhey Spider
 Ltx71
+lwp-request
+LWP::Simple
 Magnet
-Majestic SEO
-MarkMonitor
-MarkWatch
-Mediatoolkitbot
-mediawords
-Metauri
-Microsoft URL Control
-MIDown tool
-Mister PiX
+Majestic12
+Mata Hari
+meanpathbot
+Meanpathbot
+MegaIndex.ru
+MFC_Tear_Sample
+MIIxpc
 Mojeek
-MSIECrawler
-Nameprotect
+Morfeus Fucking Scanner
+MS Web Services Client Protocol
+muhstik-scan
+Name Intelligence
 Navroad
-NearSite
+Nessus
 Netcraft
+netEstate NE Crawler
+NetLyzer
 NetMechanic
+NetSpider
 Netvibes
 NetZIP
-Nibbler
 NICErsPRO
-Niki-bot
-Nimbostratus
-NPbot
-Octopus
+Nmap
+Nutch
 Offline Explorer
+Openfind
+OpenLinkProfiler
 Openvas
-OrangeBot
 OutclicksBot
-OutfoxBot
-Page Analyzer
 PageGrabber
-page scorer
-Panscient
 Pavuk
+PECL::HTTP
 PeoplePal
-Picscout
-Picsearch
 PictureFinder
 Pimonster
+Pi-Monster
 Pixray
 PleaseCrawl
 plumanalytics
+Pockey
+POE-Component-Client-HTTP
 Probethenet
-ProWebWalker
+Pump
 PxBroker
-PyCurl
 QueryN Metasearch
 Quick-Crawler
 RankActive
-RankActiveLinkBot
 RankFlex
 RankingBot
+RankingBot2
 RankurBot
 Reaper
 RepoMonkey
-Ripper
-RocketCrawler
 Rogerbot
 s1z.ru
-SBIder
+ScanAlert
 scan.lol
-ScoutJet
-Scrapy
 ScreenerBot
-Searchestate
 SearchmetricsBot
-SEOkicks
+SemrushBot
+SEOkicks-Robot
 Seomoz
-SeoSiteCheckup
-serpstatbot
-sexsearcher
-SISTRIX
-SiteLockSpider
-SiteSnagger
+SEOstats
+SiteExplorer
+Siteimprove
+Site Sucker
 Sitevigil
+SlySearch
+SMTBot
 Snapbot
-Snoopy
-Sociscraper
+SocialRankIOBot
+sogouspider
 Sogou web spider
-Sosospider
 Sottopop
 SpaceBison
+Spanner
 sp_auditbot
-Spinn3r
+Spbot
+SputnikBot
+spyfu
 Sqworm
 Sucker
-Sucuri
-SuperBot
 SuperHTTP
-SurveyBot
 Suzuran
-T0PHackTeam
+sysscan
+T8Abot
+tAkeOut
+Teleport
+TeleportPro
 Telesoft
-Telesphoreo
-Telesphorep
+TheNomad
 Thumbor
 Titan
-Trendiction
-Trendictionbot
 trendiction.com
 True_Robot
 Turingos
-TwengaBot
 UnisterBot
-Upflow
-Vagabondo
-VB Project
-Virusdie
-VoidEYE
+Vacuum
+VCI
+VidibleScraper
+Voil
 Voltron
-WBSearchBot
+WebBandit
+WebCollage
+Web Enhancer
 Web Fuck
-WebGo IS
-webmeup-crawler
+WebImageCollector
+WebLeacher
 WebPix
-Web Pix
+WebReaper
 WebSauger
-Web Sauger
-WebsiteQuester
-WebSucker
-Web Sucker
+WebsiteExtractor
+Webster
 WebWhacker
-Whack
+WebZIP
 Whatweb
 Who.is Bot
 WinHTTrack
+WiseGuys Robot
 WISENutbot
-Wprecon
-WPScan
-x09Mozilla
+Wonderbot
+Woobot
+WWW-Collector-E
+WWW::Mechanize
+WWWOFFLE
 Xaldon WebSpider
-Xaldon_WebSpider
 xpymep1.exe
 Zauba
 zauba.io
 Zeus
-zgrab
 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 c2009ec20..2f7a336ed 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 @@
-404enemy
-80legs
+Abonti
 Aboundexbot
 AfD-Verbotsverfahren
 Aipbot
 Alexibot
-AllSubmitter
+AlphaBot
+Apexoo
 archive.org_bot
 Asterias
 Attach
-BackDoorBot
-Backlink-Ceck
+autoemailspider
+BacklinkCrawler
 BackWeb
-Bandit
+Badass
 BatchFTP
-Battleztar Bazinga
 BBBike
+BDCbot
 BDFetch
+BetaBot
+Blackboard
 Black Hole
-BlackWidow
 Blow
-BlowFish
 Boardreader
-Bolt
 BotALot
-Bullseye
-Calculon
-CazoodleBot
-CheeseBot
-CherryPicker
+Buddy
+BuiltBotTough
+BunnySlippers
+BuzzSumo
+CATExplorador
+CCBot
 CheTeam
 ChinaClaw
 Chlooe
-Claritybot
-Cliqzbot
+Collector
+Copier
 Craftbot
 crawler4j
-crawler.feedback
+crawl.sogou.com
 Crescent
+CrunchBot
 CSHttp
 Curious
 Custo
-DatabaseDriverMysqli
 DataCha0s
+demandbase-bot
 Deusu
+Devil
 Digincore
-DigitalPebble
+Dirbuster
 Disco
+Discobot
 Discoverybot
 Dispatch
-DittoSpyder
+DnyzBot
+DomainCrawler
 DomainStatsBot
+Dotbot
 Download Wonder
+Drip
 DSearch
 Ebingbong
-Exabot
+EMail Siphon
+EMail Wolf
+EroCrawler
+Evil
 Express WebPictures
-Extreme Picture Finder
-EyeNetIE
+Extractor
+ExtractorPro
 facebookscraper
-Firefox/7.0
-Freeuploader
+Fimap
+FlashGet
 FyberSpider
-Fyrebot
-Gigablast
-Gotit
-Go!Zilla
+Genieo
+GermCrawler
+Getintent
+GetRight
+Go-Ahead-Got-It
+GoZilla
+Grabber
+GrabNet
+GrapeshotCrawler
 GT::WWW
+Haansoft
+HaosouSpider
+Harvest
 Havij
-HMView
-HTTP::Lite
-HybridBot
+HEADMasterSEO
 Iblog
-IDBot
+Id-search
+IlseBot
+Image Fetch
+Image Sucker
 Indy Library
-InfoNaviRobot
 instabid
-Internet Ninja
-internetVista monitor
-IRLbot
-Iskanie
+Intelliseek
+InterGET
+ips-agent
 IstellaBot
-JennyBot
-JetCar
+JamesBOT
 Jetty
-JOC Web Spider
-JustView
-Jyxobot
-Keyword Density
-Larbin
+JikeSpider
+Jorgee
+Kenjin Spider
+Kozmosbot
+Lanshanbot
 LeechFTP
 LeechGet
-LibWeb
+LexiBot
 Libwhisker
-Lightspeedsystems
 Linkdexbot
 LinkpadBot
-LinksManager
 LinkWalker
-LinqiaScrapeBot
-Lipperhey Spider
-Litemage_walker
+LinqiaRSSBot
+Lipperhey
 Lmspider
 LNSpiderguy
-lwp-request
-LWP::Simple
+Ltx71
+lwp-trivial
 Mag-Net
+magpie-crawler
 Mail.RU_Bot
-Majestic12
 Majestic SEO
-MarkWatch
+Masscan
 Mass Downloader
-MauiBot
-Meanpathbot
-Mediatoolkitbot
-MegaIndex.ru
+Mata Hari
+meanpathbot
+MeanPath Bot
+mediawords
 Metauri
-Microsoft Data Access
+Microsoft URL Control
 MIIxpc
-Mister PiX
+Mojeek
 Morfeus Fucking Scanner
 Mr.4x3
-MSFrontPage
+MSIECrawler
+Msrabot
+MS Web Services Client Protocol
 muhstik-scan
 Musobot
-NearSite
-Nessus
 NetLyzer
-Nettrack
+NetMechanic
+Net Vampire
 NextGenSearchBot
 Niki-bot
 NimbleCrawler
-Nimbostratus
-Ninja
-NPbot
-oBot
+Nmap
+Nutch
 Octopus
-Offline Explorer
+Offline Navigator
 OnCrawl
 Openfind
 Openvas
-OpenVAS
+OrangeBot
+OrangeSpider
 OutclicksBot
 OutfoxBot
-PageAnalyzer
-PageGrabber
-page scorer
-PageScorer
+Pandalytics
 pcBrowser
-PECL::HTTP
-PeoplePal
-PHPCrawl
-Picscout
-PictureFinder
-Pimonster
 Pixray
-plumanalytics
+Pockey
 POE-Component-Client-HTTP
-Pump
+Probethenet
+ProPowerBot
 PxBroker
 PyCurl
+QueryN Metasearch
 Quick-Crawler
-RankurBot
-Recorder
-Rogerbot
+RankActiveLinkBot
+RankingBot2
+Reaper
+RebelMouse
+ReGet
+RocketCrawler
 s1z.ru
-SBIder
+SalesIntelligent
 Scanbot
-scan.lol
-ScoutJet
 Scrapy
 Screaming
-ScreenerBot
-SemrushBot
+SearchmetricsBot
+SEOkicks
 SEOkicks-Robot
 SEOlyticsCrawler
 Seomoz
-seoscanners
-serpstatbot
-Siphon
-Sitebeam
-SiteSnagger
-Site Sucker
-Sitevigil
-SmartDownload
-SMTBot
+SeoSiteCheckup
+sexsearcher
+SiteSucker
+SlySearch
 Snake
 Snapbot
-Sociscraper
 sogouspider
+Sogou web spider
 Sosospider
 Sottopop
 Spammen
 SpankBot
 Spbot
-Spinn3r
+SputnikBot
+spyfu
 Sqlworm
-Stripper
-Sucker
-Sucuri
+Sqworm
+Steeler
+SuperBot
 SuperHTTP
-SurveyBot
-Suzuran
 Swiftbot
-sysscan
+Szukacz
 T0PHackTeam
-tAkeOut
 Teleport
-Telesphorep
-Toata
+TeleportPro
+The Intraformant
+Thumbor
 Tracemyfile
-trendiction.com
-True_Robot
-Turnitin
-Twice
+Trendiction
+Trendictionbot
 Typhoeus
 UnisterBot
-Upflow
-URLy Warning
 URLy.Warning
-VCI
-VidibleScraper
+Vacuum
 Virusdie
-WebBandit
-WebCollage
-WEBDAV
-WebFetch
-Web Fetch
-WebFuck
+VoidEYE
+Voil
+Wallpapers/3.0
+WallpapersHD
+Webalta
+WebCopier
+Web Enhancer
+WebGo IS
 WebImageCollector
-WebLeacher
 WebmasterWorldForumBot
-Web Pix
-Website Quester
-WebSucker
-WebWhacker
-WeSEE
+webmeup-crawler
+WebSauger
+Web Sauger
+Webshag
+WebsiteQuester
+Web Sucker
+WebZIP
 Whack
+Whacker
+Who.is Bot
+WinHTTrack
 WISENutbot
+Wonderbot
 Wotbox
 WPScan
 WWW::Mechanize
-WWWOFFLE
 x22Mozilla
 Xaldon_WebSpider
 Xenu
-xpymep1.exe
+Zauba
+zauba.io
 Zermelo
-Zitebot
-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 bf6ab0033..1fa9d4e96 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 @@
-apps-analytics.net
-cleanmypc.com
-dtnlyss.com
-franklinfire.co
-heartofpayne.xyz
-koopilka.com
-predominant-invent.tk
-sanatorrii.ru
-stroiminsk.com
-thexart.club
+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
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index e3d9ba656..7ebb7dbdb 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 @@
-0daymusic.org
-123any.com
-12masterov.com
-21h2o.com
-2345.com
-51.la
-777-club.ru
-8lufu.com
-9icmzvn6.website
-aa08daf7e13b6345e09e92f771507fa5f4.com
-aa8780bb28a1de4eb5bff33c28a218a930.com
-aab94f698f36684c5a852a2ef272e031bb.com
-aaronabel.com
-abovetherivernc.com
-absugars.com
-acgs.tk
-actices.com
-addray.pro
-adserver-e7.com
-adultgalls.com
-adult-shop.com.ua
-adventureparkcostarica.com
-adzerg.com
-a.frcls.fr
-agapovdg.ru
-aghanyna.com
-air-edem.ru
-alert-jdh.xyz
-alfabot.xyz
+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
+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
-allboard.xobor.de
-alldubai.biz
-amospalla.es
-amyfoxfitness.com
+allcredits.su
+allwidewallpapers.com
+aloofly.com
+amateurlivechat.org
 analytics-ads.xyz
-animal36.com
+animalrank.com
 animaltoplist.com
-anticrawler.org
-apimountainbikei-a.akamaihd.net
-appearance-cool.com
-apple.com-cleaner.systems
-applyneedy.xyz
-arabgirls.adultgalls.com
-arendas.net
-astrochicks.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
-atmovs.com
-atofilms.com
-auto4style.ru
-autonew.biz
-avek.ru
-aviav.ru
-azadnegar.com
-azazaporn.com
-azbukafree.com
-babieca.com
-babs.com.ua
-baersaratov.ru
-bankmib.ru
-bannerbank.ru
-bannerconnect.net
-baoxaydung.com.vn
-bard-real.com.ua
-basisches-wasser.net
-beget.tech
-beremenyashka.com
-bestfortraders.com
-bestserials.com
-betteroffers.review
-big-cash.net
-bioinnovate.co
-blackplanet.com
-blacktwhite.com
-blog-hits.com
-blogrankers.com
-bonanza-fortune.men
-bookmaker-bet.com
-boole.onlinewebshop.net
-bosman.pluto.ro
-bpro1.top
-buynorxx.com
-buytizanidineonlinenoprescription.blogspot.com
-bzero1jewelry.net
-cactussoft.biz
-calc-for-credit.ru
-calcularpagerank.com
-camdenmemorials.com
-cardiosport.com.ua
-cartiertrinity.xyz
-ccjp.eu
-cctva.tv
-cdncash.com
-cejewelry.xyz
-cellfun.mobi
-cfacarrosserie74.com
-cheapwebsitehoster.com
-cindymatches.com
-cinemaflix.website
-cleanallvirus.com
+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
+bloke.com
+bmw-ark.ru
+boltalko.xyz
+brandbucket.com
+brg8.com
+bristolhotel.com
+bristolhotel.com.ua
+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
+choosecuisine.com
+cialischsrx.com
+cialisndbrx.com
+cialisovercounteratwalmartusa.com
+cleanallspyware.com
+cleanersoft.com
 cleanpcnow.com
-cleansearch.net
 clean-start.net
-cmd.kz
-codysbbq.com
-co.lumb.co
-comissionka.net
-coolgamechannel.com
-coslab.club
-countbertwistdisp26.soup.io
-counter.bloke.com
-creativehutindia.com
-creditwell.ru
-crynet.cc
-cscwtalkto.site
-cubs-jerseys.us
-cupday.com
-custom-product-labels.com
-cymbaltaandtizanidine.blogspot.com
-damedingel.ya.ru
-dame-ns.kz
-danashop.ru
-danceuniverse.ru
-daneshetabiat.com
-data.vtc.pw
-defenderxtactical.com
-dengi-pod-zalog-nedvizhimosti.ru
-descargar-musica-gratis.net
-dev-seo.blog
-dickssportinggoods.com
-discovertreasure-a.akamaihd.net
-disruptingdinnerparties.com
-dnepr-avtospar.com.ua
-docsportal.net
-dogoimage.com
-domainanalyzing.xyz
-domik-derevne.ru
-donvito.unas.cz
-doxysexy.com
-editmedios.com
-ee77ee.com
-elektrischezi.canalblog.com
-empirepoker.com
-energydiet-info.ru
-enskedesquashclub.se
-eorogo.top
-eredijovon.com
-escortplius.com
-escort-russian.com
-essayservicewriting.org
-estelight.ru
-event-tracking.com
-executehosting.com
-expertnaya-ocenka.ru
-expolicenciaslatam.co
-extlinks.com
-ez8motelseaworldsandiego.com
-ezigarettekaufen2.mpbloggar.se
+clean-virus-mac.com
+clicksor.net
+clknsee.com
+clksite.com
+com-cleaner.systems
+cometorussia.net
+community.allhiphop.com
+compliance-elena.xyz
+compliance-margo.top
+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
+dostavka-v-ukrainu.ru
+dosugrostov.site
+dotnetdotcom.org
+downloaddy.net
+doyouknowtheword-flummox.ml
+dptaughtme.com
+drhomes.biz
+droidlook.net
+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
-fanpagerobot.com
-fashion-stickers.ru
-fellowshipoftheminds.com
-fickenbumsen.net
+f5mtrack.com
+fakehandbags.xyz
+famix.xyz
+femmesdenudees.com
 filmbokep69.com
-financetip.eu
-frameimage.org
-frcls.fr
-freemaintenancesysforpcandmac.top
-free-share-buttons.com
-free-social-buttons.com
-funcrushgames.com
-funnymama.com
-fym.com.ru
-galaxyflowers.ru
-galeria-zdjec.com
-gateway.zscalerone.net
-gay-file.com
-geilehausfrauen.net
-generalporn.org
-generic-pills-online.com
+findacheaplawyers.com
+firesub.pl
+flex4launch.ru
+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
-glavtral.ru
-gogalleryawesome.com
-gogps.me
-golden-praga.ru
-goodwinmetals.co
-gotorussia.com
-gox.com.ua
-gpirate.com
-graphid.com
-greatfind-a.akamaihd.net
+gheus.altervista.org
+ghostvisitor.com
+glall.ru
+gratis-sexkontakte.com
+gratuitxblcodes.com
 greendream.com.ua
-growboxbl.ru
-growmyfunds.ca
-gsasearchengineranker.pw
-guardlink.com
-hdwalls.xyz
-healmytrauma.info
-hit-kino.ru
-hledejvshopech.cz
-hotloans.ru
-hotsocialz.com
-hoverboard360.at
-hreade.com
-htmlcorner.com
-https-legalrc.biz
-ico.re
-iklysha.ml
-imicrovision.com
-incest-ru.com
-innodgfdriverhm.aircus.com
-instasexyblog.com
-insurple.com
-intermesh.net
-internetartfair.com
-investsuccess.org
-istripper.com
-izismile.com
-janavibekken.no
+grtyi.com
+grupografico-pilar.com.ar
+gsmtlf.ru
+guigyverpo.cf
+gyffu.com
+hannasolution.ru
+hauleddes.com
+hawaiielectriclight.com
+hdapp1008-a.akamaihd.net
+hdxnxxtube.mobi
+healgastro.com
+hermesbracelets.xyz
+histats.com
+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
-jennyfire.ru
-jwss.cc
-jyvopys.com
-kanimage.com
-katushka.net
-kazan.zrus.org
-keyhantercume.com
-kinoduh.ru
+jeremyeaton.co
+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
-kleine-titten.biz
-kmd-pto.ru
+kinogolos.ru
+kinohit1.ru
+kinostorm.net
+kliksaya.com
+kochanelli.com
 komputernaya-pomosh-moscow.ru
-koptims.tiu.ru
-kosmetyki.tm.pl
-krasivye-devushki.net
-krynica.info
-kunstaktien.info
+konpax.com
+kupiproday.com.ua
+kurwa.win
 kutikomi.net
-ladov.ru
-lafriore.ru
-landinez.co
-lapitec.eu
-lawyers.cafe
-le-clos-des-alouettes.com
-ledis.top
-lerporn.info
+kwzf.net
+labvis.host.sk
+laparfumotec.com
+lennatin.info
+letmacworkfaster.site
 letmacwork.world
-letsart.ru
-likesdesign.com
-likesuccess.com
-livetsomudvekslingstudent.bloggersdelight.dk
-lizace.com
-locatellicorretor.com.br
-locimge.pw
-lodki-pvh.dp.ua
-lulea-auktionsverk.se
-lutherstable.org
-m0r0zk0-krava.ru
-machicon-ueno.info
-maladot.com
-manualterap.roleforum.ru
-manve.info
-map028.com
-martlinker.com
-masterseek.com
-matsdale.com
-mcadamssupplyco.com
-meddesk.ru
-mediaoffers.click
-medkritika.ru
-mega-bony-2017.pl
-megakino.net
-members.ghanaweb.com
-metalonly.info
-microsearch.ru
-microsoftportal.net
-mielec.pl
-milblueprint.com
-mindeyegames.com
-mistr-x.org
-mixtapetorrent.com
-mmofreegames.online
-mobplayer.ru
-motherboard.vice.com
+lezbiyanki.net
+life-instyle.com
+livefixer.com
+lkbennettoutlet.online
+llastbuy.ru
+lotto6888.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
+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
-mp3downloadhq.com
-msfsaar.de
-msk.afora.ru
-mulberryoutletonlineeu.com
-musezone.su
-muz-baza.net
-muz-shoes.ru
-my-big-family.com
-my-cash-bot.co
+mturkcontent.com
+musicspire.online
+mustwineblog.com
+mxgetcode.com
+mygameplus.ru
 mylida.org
-myseoconsultant.com
-mywallpaper.top
-naphukete.ru
-narkologiya-peterburg.ru
-narosty.com
-nationalbreakdown.com
-naturalpharm.com.ua
-netvouz.com
-newtechspb.ru
-nextconseil.com
-nonews.co
-nottyu.xyz
-npoet.ru
-nuker.com
-oda.as
-office2web.com
-old-rock.com
-olgacvetmet.com
-online247.ml
-onlinewritingjobs17.blogspot.ru
+nakozhe.com
+narkologiya-orel.ru
+narkologiya-penza.ru
+nbsproject.ru
+newstudio.tv
+nhl17coinsforps3.gratisblog.biz
+nlfjjunb5.ru
+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
-ororodnik.goodbb.ru
-ostroike.org
-oynat.info
-ozoz.it
-partnerline.men
-patol01.pw
-pavlodar.xkaz.org
-petsblogroll.com
-pflexads.com
-picscout.com
-pictures-and-images.com
-pillscheap24h.com
-pizza-tycoon.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
-playmsn.com
-popup.matchmaker.com
-pornhubforum.tk
-pornolook.net
-portal-eu.ru
-portside.cc
-posible.net
-pourvous.info
-pozdrawleniya.com
-pr0fit-b0x.com
-preventheadacheguide.info
-pricheski-video.com
-prizefestival.mobi
-projectforte.ru
-prombudpostach.com.ua
-promoheads.com
-prostitutki-astana.org
-prostitutki-novgoroda.org
-pyrodesigns.com.au
+playfortuna-play.ru
+pokerniydom.ru
+polytopesexempt.com
+popserve.adscpm.net
+poquoson.org
+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
-ranksignals.com
+qpypcx.com
+quickbuck.com
+quickchange.cc
+quizzitch.net
+ranksonic.info
 rapidokbrain.com
-rcb101.ru
-r-control.ru
-registratciya-v-moskve.ru
-reimageplus.com
-remont-comp-pomosh.ru
+rapidsites.pro
+referencemoi.com
 remont-mobile-phones.ru
-remote-dba.de
-renewablewealth.com
-rent2spb.ru
-rightenergysolutions.com.au
-rockprogblog.com
-rome2rio.com
-royal-betting.net
-russian-postindex.ru
-rybalka-opt.ru
-sbricur.com
-sbwealthsolutions.ca
-scalerite.co.za
-scanmyphones.com
-scanner-john.top
-scanner-mary.top
-scmor.ilxc.cc
-scripted.com
-searchinterneat-a.akamaihd.net
-seasonvar.ru
-seeresultshub-a.akamaihd.net
-sel-hoz.com
+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
-seoanalyses.com
-seoholding.com
-sexblog.pw
-sex-tracker.com
-sexvideo-sex.com
-share-buttons-for-free.com
-sherlock.se
-shillyourcoins.com
-shmetall.com.ua
+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
-shopvilleroyboch.com.ua
 sibecoprom.ru
-simon3.ru
-sinestesia.host.sk
-site5.com
-siteimprove.com
-sitevaluation.org
-skachat-besplatno-obrazcy.ru
+sildenafil-tadalafil.info
+simple-share-buttons.com
+sirpornogratis.xxx
+site-speed-checker.site
+sivs.ru
 skuteczna-dieta.co.pl
-smailik.org
-snjatie-geroinovoy-lomki.ru
-soblaznu.net
-socas.pluto.ro
-social-search.me
-social-s-iii.xyz
-sodexo.com
-solinf.co
-sophang8.com
-soserfis.com
-sotechco.co
-spaceshipad.com
-special-porn.com
-spidtest.space
-spy-app.info
-stairliftsarea.com
-sterva.cc
-stockspmb.info
-strana-solnca.ru
-streetfire.net
-stroiminsk.com
-stromerrealty.com
-stroyhelp-dv.ru
-studiofaca.com
-survival.betteroffers.review
-swinger-mobil.net
-tacbelarus.ru
-tattooreligion.ru
-tds-advert002.info
-tedy.su
-teguh.info
-thebitcoincode.com
-thetardistimes.ovh
-thfox.com
-timdreby.com
-timer4web.com
-titslove.yopoint.in
-tizanidinehydrochloride4mgstreetvalue.blogspot.com
-tizanidinenarcotic.blogspot.com
-tomatis.gospartner.com
-topkarkas.com
-top-l2.com
-topsiteminecraft.com
-tradgardspartner.se
-trumpetedextremes.com
-twitlinks.com
-twittruth.com
+sky-mine.ru
+smokewithrabbits.com
+soc-econom-problems.ru
+socialseet.ru
+sohoindia.net
+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
+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
+top10registrycleaners.com
+top10-way.com
+toproadrunner5.info
+totu.us
+tovaroboom.vast.ru
+trailer.cinemaflix.website
+tuberkuleznik.ru
+tvoystartup.ru
+typer.one
 ultimatesetnewfreeallsoftupgradesystems.pw
-uptime-gamma.net
-userequip.com
-usswrite.com
-utiblog.fr
-validccseller.com
-veles.shop
-venta-prom.ru
-vertaform.com
-vesnatehno.ru
-vezuviy.su
-via-energy-order.com
-viagengrarx.com
-video-chat.cn
-vilingstore.net
-viteonlusarezzo.it
-voditeltrezviy.ru
-voluumtracker1.com
+universals.com.ua
+usadacha.net
+ustion.ru
+v720hd.ru
+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
-watchmygf.net
 watsonrealtycorp.com
-weburok.com
+web-betting.ru
+website-speed-check.site
 weclipart.com
-wedding0venues.tk
-westum.se
-wladimirpayen.com
-womama.ru
-woman-h.ru
-worldhistory.biz
-wormix-cheats.ru
-wufak.com
-www.arenda-yeisk.ru
-www.event-tracking.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
-xmlinde.com
-xn--80aanaardaperhcem4a6i.com
-xn--80ahvj9e.xn--p1ai
-xn--80aodinpgi.xn--p1ai
-xn----8sbhefaln6acifdaon5c6f4axh.xn--p1ai
-x-true.info
-yeartwit.com
-yginekologa.com
-yoluxuryevents.com
-yourads.website
-youtubedownload.org
-ypmuseum.ru
-zdesoboi.com
-zebradudka.com
-zeleznobeton.ru
-zeroredirect10.com
-zigarettenonlinekaufen1.blox.pl
-znakomstvaonlain.ru
+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
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 0fd7012f8..f71e22271 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 @@
-1pamm.ru
-3weekdiet.com
-4pp13.com
-8558l.jobs.net
-98oi.ru
-aa8b68101d388c446389283820863176e7.com
-actionnooz.com
-adventureparkcostarica.com
-advertex.info
-afora.ru
-a.frcls.fr
-aihelen.net
-allesohnegirls.net
-alveris.ru
-amung.us
-anabolics.shop
-architecturebest.com
-artel116.ru
-autobudpostach.club
-autogrep.ru
-aviav.org
+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
-aviva-limoux.com
-avtocredit-legko.ru
-babs.com.ua
-babyguns.ru
-bankiem.pl
-bestimagecoollibrary.com
-biteg.xyz
-bitporno.sx
-bloggerads.net
-blogrankers.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
-btnativenav.com
-burger-imperia.com
-businesxxl.com
-buyparajumpers.online
-bvlgariring.xyz
-byme.se
-casinos4dummies.co.uk
-caulderwoodkennels.com
-cfjump.com
-cheapmarmot.online
-claytransformations.info
-clean-start.net
-clicksor.net
-coldfilm.ru
-com-onlinesupport.site
-companies-catalog.com
-compliance-fred.top
-compliance-mary.top
-cookie-law-enforcement-aa.xyz
-cookie-law-enforcement-ff.xyz
-covadhosting.biz
-covetnica.com
-creditwell.ru
-d0t.ru
-dailystrength.org
-delitime.info
-deplim.com
-digitalfaq.com
-div.as
-doktoronline.no
-domaincrawler.com
-domainsphoto.com
-edelstahlschornstein-123.de
-elektrozigaretten2.yn.lt
-elidelcream.weebly.com
-englishdictionaryfree.com
-essayassist.com
-essaypro.com
-exoclick.com
-exonline.info
-fashion.stellaconstance.co
-fastcrawl.com
-firstsiteguide.com
-fitnesspiks.com
-flash4fun.com
-flauntyoursite.com
-forsex.info
-forum.tvmir.org
-foto-weinberger.at
-freakycheats.com
-freesitetest.com
-fuckingawesome.com
-funponsel.com
-gabeshop.ru
-galleryawesome.com
-game300.ru
-game-mmorpg.net
-gay-site.store
-gayxperience.com
-ghostvisitor.com
-go2album.com
-gsbs.com.ua
-hdpixent.com
+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
+forpostlock.ru
+fotopop.club
+frameimage.org
+front.to
+funnel.co.za
+gameonasia.com
+gilsonchiro.xyz
+globatur.ru
+golaya.pw
+gonextmedia.com
+gratuitxblcodes.com
+gsou.cf
+guiadeserraazul.com
+guruofcasino.com
+gwebtools.com.br
+gwhwpxbw.bloger.index.hr
+hanink.biz.ly
 headpharmacy.com
-homeinns.com
-hotelcrocenzi.sm
-houseofgaga.ru
-ie.57883.net
-igrovyeavtomaty777.ru
-imagecoolpub.com
-internetproviderstucson.com
-inzn.ru
-jerseywholesalebizchina.com
-jobmarket.com.ua
-journalhome.com
-kalandranis.gr
-kazan.zrus.org
-keywords-monitoring-your-success.com
-kollesa.ru
-kredit-pod-zalog-krasnodar.ru
-ku6.com
-kursy-ege.ru
+heatpower.ru
+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
-lesbian.xyz
-lida-ru.com
+law-check-nine.xyz
+lawyers.cafe
 linkdebrideur.xyz
-lkbennettstore.online
-ltvperf.com
-malwareremovalcenter.com
-managerpak204.weebly.com
-manualterap.roleforum.ru
-manyresultshub-a.akamaihd.net
-masserect.com
-meble-bogart.info
-medosmotr-ufa.ru
-menhealed.net
-mini.7zap.com
-mirtorrent.net
-mitrasound.ru
-mockupui.com
-moinozhki.com
-monclercheap.xyz
-monetizationking.net
-more-letom.ru
-moscow-region.ru
-mp3ringtone.info
-mrsdalloways.com
-musicktab.com
-mvpicton.co.uk
-myftpupload.com
-myonigroup.com
-mypets.by
-narkologiya-peterburg.ru
-na-telefon.biz
-naughtyconnect.com
-nerudlogistik.ru
-nucia.biz.ly
-nufaq.com
-ochistka-stokov.ru
-offergroup.info
-onemactrckr.com
-online-hit.info
-ordernorxx.com
-outpersonals.com
-palocco.it
-pc-virus-d0l92j2.pw
-pendelprognos.se
-pizza-imperia.com
-playtap.us
-pliks.pl
-popugauka.ru
-pornogig.com
-pornpost.in
-poshiv-chehol.ru
-producm.ru
-pronorm.fr
-prospekt-st.ru
-prosperent.com
-pst2017.onlinewebshop.net
-quizzitch.net
-raavidesigns.com
-realizmobi.com
-recipedays.com
-redbottomheels.xyz
-refads.pro
-refererx.com
-remontbiz.ru
-rewardpoll.com
-rospromtest.ru
-scanner-mary.top
-scrapinghub.com
-selectads.men
-servingnotice.com
-sexpartygirls.net
-sexsearch.com
-shakhtar-doneck.ru
-shoppytoolmac.com
-shtaketniki.ru
-sigmund-freud.co.uk
-sinestesia.host.sk
-sk.golden-praga.ru
-slavkokacunko.de
-soblaznu.net
-stanthonyscatholicchurch.org
-starwars.wikia.com
-stillmiracle.com
-streetfooduncovered.com
-stroydetali.ru
-studiofmp.com
-studiokamyk.com.pl
-suggest-keywords.com
-supermama.top
-surflinksmedical.com
-svarbit.com
-tanieaukcje.com.pl
-taqywu51.soup.io
-td-33.ru
-teastory.co
-terrafootwear.us
-textads.men
-thebluenoodle.com
-thecoolimages.net
-thefotosgratis.eu
-thegolfclub.info
-thepantonpractice.co.uk
-thewomenlife.com
-tizanidine6mg.blogspot.com
-toon-families.com
-totu.us
-traderzplanet.in
-trkur.com
-trucri.me
-tubeoffline.com
-uhodzalijami.ru
-umg-stroy.ru
-url-img.link
-validccseller.com
-vbabule.net
-via-energy-order.com
+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
+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
+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
+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
+tds-advert005.info
+thaisamkok.com
+thenetinfo.com
+thetoiletpaper.com
+titslove.yopoint.in
+tizanidinehydrochloride2mg.blogspot.com
+top1-seo-service.com
+tourcroatia.co.uk
+track112.site
+traffique.net
+tupper-posuda.ru
+turn-up-life.life
+udayavani.com
+via-energy-cumpara.com
+viagengrarx.com
+videochat.mx
+videtubs.pl
 viel.su
-voronezh.xrus.org
-wanker.us
-webtherapy.ru
-wejdz-tu.pl
+vipps.com.my
+vkmusics.ru
+vkonche.com
+vmnmvzsmn.over-blog.com
+vremya.eu
+vsexkontakte.net
+vut.com.ru
+webextract.profound.net
 westen-v.life
-wowas31.ucoz.ru
-xitjw.info
-xn--80adaggc5bdhlfamsfdij4p7b.xn--p1ai
-xn--b1ag5cfn.xn--p1ai
-xxx-cam.webcam
-yellowfootprints.com
-youdao.com
-yourtemplatefinder.com
-zaim-pod-zalog-krasnodar.ru
-zhuravlev.info
-zigarettenonlinekaufen2.bloog.pl
-zolotoy-lis.ru
+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
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index a7215fb74..f371d9e5f 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,11 +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 bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.14.2</center>
 </body>
 </html>
-l>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -116,14 +126,4 @@ l>
 <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/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index f371d9e5f..a7215fb74 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.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/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index c3c284efc..bc389ee32 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	0;
+104.154.120.187	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index ec1b90745..550592aeb 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 313af1b3b..8452b571b 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 b905035cc..5430e93de 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1735
+#### Version: V4.2019.07.1736
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index f3acfa4fb..dd1af8e35 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1735
+#### Version: V4.2019.07.1736
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index cce70ec05..45da3b965 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.1735
+#### Version: V4.2019.07.1736
 #### 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 8b2839e16..0f74ac5f2 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.1735
+#### Version: V4.2019.07.1736
 #### 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 2f63d0f6c..f364dd6ae 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.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 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 0053b6810..827f63536 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.1735
-### Updated: Tue Jul  2 14:04:34 SAST 2019
+### Version: V3.2019.07.1736
+### Updated: Tue Jul  2 14:24:37 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index 2f63d0f6c..f364dd6ae 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1735
-### Updated: Tue Jul  2 14:04:32 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:36 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index de5224e6c..b1c0f3028 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1735
-### Updated: Tue Jul  2 14:04:36 SAST 2019
+### Version: V4.2019.07.1736
+### Updated: Tue Jul  2 14:24:38 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##