diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index 5587fdfc9..b2ae71280 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.1724
-### Updated: Mon Jul  1 16:26:57 SAST 2019
+### Version: V3.2019.07.1726
+### Updated: Mon Jul  1 17:07:08 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..0fcb73d00 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;
+35.192.187.174	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..3dac4f84e 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;
+35.192.187.174	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 5587fdfc9..b2ae71280 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.1724
-### Updated: Mon Jul  1 16:26:57 SAST 2019
+### Version: V3.2019.07.1726
+### Updated: Mon Jul  1 17:07:08 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..0fcb73d00 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;
+35.192.187.174	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..3dac4f84e 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;
+35.192.187.174	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 5587fdfc9..b2ae71280 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.1724
-### Updated: Mon Jul  1 16:26:57 SAST 2019
+### Version: V3.2019.07.1726
+### Updated: Mon Jul  1 17:07:08 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..0fcb73d00 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;
+35.192.187.174	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..3dac4f84e 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;
+35.192.187.174	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 5587fdfc9..b2ae71280 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.1724
-### Updated: Mon Jul  1 16:26:57 SAST 2019
+### Version: V3.2019.07.1726
+### Updated: Mon Jul  1 17:07:08 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/nginx.conf b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/nginx.conf
index 132f680d1..5c7fa78f3 100644
--- a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/nginx.conf
+++ b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/nginx.conf
@@ -60,6 +60,7 @@ http {
 
 	include /etc/nginx/conf.d/*.conf;
 	include /etc/nginx/sites-enabled/*;
+ 
 }
 
 
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/nginx.conf b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/nginx.conf
index 40013985d..070d47a71 100644
--- a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/nginx.conf
+++ b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/nginx.conf
@@ -59,6 +59,12 @@ http {
 	##
 
 	include /etc/nginx/sites-enabled/*;
+ 
+ 	
+
+# Nginx Bad Bot Blocker Includes
+	include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d/botblocker-nginx-settings.conf; 
+ 	include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d/globalblacklist.conf; 
 }
 
 
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index 5587fdfc9..b2ae71280 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1724
-### Updated: Mon Jul  1 16:26:57 SAST 2019
+### Version: V3.2019.07.1726
+### Updated: Mon Jul  1 17:07:08 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index 7ed156054..985914f0a 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
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..6073098c1 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;
+34.66.178.120           0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index 7ed156054..985914f0a 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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 90fe4f9d3..6893ce0fc 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	1;
+35.192.136.167	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index bc389ee32..879967dc9 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	0;
+35.192.136.167	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 7ed156054..985914f0a 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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 90fe4f9d3..6893ce0fc 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	1;
+35.192.136.167	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index bc389ee32..879967dc9 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	0;
+35.192.136.167	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 7ed156054..985914f0a 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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 90fe4f9d3..6893ce0fc 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	1;
+35.192.136.167	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
index bc389ee32..879967dc9 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.120.187	0;
+35.192.136.167	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 7ed156054..985914f0a 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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..f1c0e43d7 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;
+35.193.14.140           0;
+35.192.136.167          0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index 1a691dd2b..96df0bc86 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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 5bfb5e340..4fe0ae6e1 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.224.112.202          0;
+104.198.131.58          0;
+35.188.73.34            0;
+35.192.187.174          0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index 7ed156054..985914f0a 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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 496177b18..0ee5543b1 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.192.85.2             0;
-35.184.226.236          0;
+35.192.187.174          0;
+35.188.73.34            0;
+34.66.178.120           0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index 7ed156054..985914f0a 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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..0fcb73d00 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;
+35.192.187.174	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 0080fd7ae..3d7a162e6 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 @@
 BLEXBot
-Cosmos
-crawler4j
-DomainSigmaCrawler
-Dotbot
-Meanpathbot
-mediawords
-NetZIP
-seoscanners
-Turnitin
+BotALot
+DomainAppender
+ips-agent
+Majestic-SEO
+MSFrontPage
+Name Intelligence
+POE-Component-Client-HTTP
+QueryN Metasearch
+SuperHTTP
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index 13295850e..9759a9615 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
+Abonti
 ADmantX
-AfD-Verbotsverfahren
-AhrefsBot
-AIBOT
-Aipbot
 Alexibot
-AllSubmitter
-ASPSeek
+Alligator
 Attach
-autoemailspider
-Backlink-Ceck
+Badass
 Bandit
+Battleztar Bazinga
 BBBike
 BDFetch
-BetaBot
-Bigfoot
+Bitacle
 BlackWidow
+BLEXBot
 Blow
 Boardreader
-BotALot
+Bolt
+Brandprotect
 Brandwatch
-Buddy
 BuiltBotTough
+Bullseye
 BunnySlippers
-BuzzSumo
-CherryPicker
-CheTeam
-ChinaClaw
+Calculon
+CCBot
+Cegbfeieh
 Chlooe
+Cliqzbot
 Cloud mapping
+Cogentbot
 cognitiveseo
-Collector
 com.plumanalytics
+Copier
 CopyRightCheck
-Cosmos
 Craftbot
-crawler4j
-crawler.feedback
 crawl.sogou.com
 Crescent
 CrunchBot
-Curious
-DatabaseDriverMysqli
+DataCha0s
 DBLBot
+Devil
+Digincore
+DIIbot
 Dirbuster
-Discobot
+Discoverybot
+Dispatch
+DittoSpyder
+DnyzBot
 DomainAppender
+DomainSigmaCrawler
 DomainStatsBot
-Dragonfly
-DTS Agent
-EasyDL
-eCatch
+Download Wonder
+Drip
+Ebingbong
 ECCP/1.0
 EMail Wolf
-EroCrawler
+evc-batch
 Exabot
-Ezooms
+Express WebPictures
+ExtractorPro
 facebookscraper
+FDM
 FemtosearchBot
-Fimap
-Firefox/7.0
 Freeuploader
-FrontPage
-GetWeb
+FyberSpider
+Fyrebot
+GermCrawler
 Gigablast
 Gigabot
+G-i-g-a-b-o-t
 Go-Ahead-Got-It
 Gotit
-GoZilla
 Go!Zilla
-GrapeshotCrawler
+Grabber
+GrabNet
 GridBot
 HaosouSpider
+Havij
 Heritrix
-Hloader
-HTMLparser
-HTTP::Lite
 HTTrack
-Humanlinks
-Id-search
 IlseBot
-Image Fetch
-Image Sucker
+IndeedBot
+Indy Library
 InfoTekies
 Intelliseek
 Internet Ninja
-InternetSeer
-internetVista monitor
-JamesBOT
+Iria
+Iskanie
 Jbrofuzz
 JennyBot
-JetCar
-JikeSpider
+Jetty
 JOC Web Spider
 Joomla
-JustView
+Jyxobot
+Kenjin Spider
 Keyword Density
 Kozmosbot
-LexiBot
-Lftp
-LibWeb
-Linkdexbot
+Lanshanbot
+Larbin
+LeechFTP
+LeechGet
+Lightspeedsystems
 LinkextractorPro
-LinkScan
-LinksManager
 LinqiaRSSBot
+LinqiaScrapeBot
 Lipperhey
 Litemage_walker
-lwp-request
+LNSpiderguy
 lwp-trivial
+Magnet
 Mag-Net
 magpie-crawler
-Mail.RU_Bot
+Majestic12
 Majestic SEO
-MarkWatch
-Mass Downloader
+MarkMonitor
 MauiBot
-Metauri
-MFC_Tear_Sample
+meanpathbot
+Meanpathbot
+mediawords
+MegaIndex.ru
+Microsoft Data Access
 MIDown tool
+MIIxpc
+MJ12bot
+Mojeek
 Morfeus Fucking Scanner
 Mr.4x3
-MSFrontPage
-muhstik-scan
-Musobot
+Msrabot
+MS Web Services Client Protocol
+Nameprotect
+NearSite
 Nessus
 NetAnts
-netEstate NE Crawler
+Netcraft
+NetLyzer
 NetMechanic
 NetSpider
+Nettrack
 Net Vampire
+Netvibes
+Nibbler
 NICErsPRO
 Niki-bot
-NimbleCrawler
-Nimbostratus
-Ninja
+Nmap
 oBot
 Octopus
 Offline Explorer
 Offline Navigator
-OpenVAS
+OnCrawl
 OrangeBot
 OrangeSpider
 OutclicksBot
-page scorer
-PageScorer
+PageAnalyzer
+PageGrabber
+Panscient
+Papa Foto
 Pavuk
 pcBrowser
 PeoplePal
-PictureFinder
-Pixray
-PleaseCrawl
-plumanalytics
 Pockey
-Probethenet
-ProWebWalker
-Pump
+ProPowerBot
+Psbot
 PxBroker
+PyCurl
+QueryN Metasearch
+Quick-Crawler
+RankActive
 RankFlex
-RankingBot
-RankurBot
+RealDownload
+Reaper
 RebelMouse
+ReGet
 Ripper
-SBIder
+RocketCrawler
+s1z.ru
+SalesIntelligent
 ScanAlert
-Scanbot
-ScoutJet
-Scrapy
+scan.lol
+ScreenerBot
 SearchmetricsBot
-SEOkicks
+SemrushBot
 SEOlyticsCrawler
 Seomoz
 SEOprofiler
-SeoSiteCheckup
-serpstatbot
-Siphon
+SEOstats
+Shodan
 SISTRIX
-SiteExplorer
-Siteimprove
 SiteLockSpider
 SiteSnagger
-Site Sucker
-Sitevigil
+SlySearch
 Snake
-Snapbot
-SocialRankIOBot
-Sociscraper
-Spammen
-SpankBot
-sp_auditbot
-Spinn3r
-Sucuri
+sogouspider
+SpaceBison
+Sqlworm
+SuperBot
+Surfbot
 SurveyBot
 Suzuran
 Swiftbot
 T0PHackTeam
 T8Abot
 tAkeOut
-Teleport
 Telesphoreo
 The Intraformant
-Thumbor
-Titan
 Toata
+Toweyabot
+Tracemyfile
 Trendiction
 Trendictionbot
 trendiction.com
+trendiction.de
 True_Robot
 Turingos
-Turnitin
-Twice
+TwengaBot
 UnisterBot
+Upflow
 URLy.Warning
-VB Project
+Vagabondo
 VidibleScraper
+VoidEYE
 Voltron
-WallpapersHD
+Wallpapers/3.0
+WBSearchBot
 WebAuto
 Web Auto
-Web Collage
-WebCopier
-WebEnhancer
-Web Enhancer
+WebCollage
 WebFetch
 Web Fetch
-WebGo IS
-WebImageCollector
-WebsiteQuester
+WebLeacher
+WebPix
+WebSauger
 Website Quester
 Webster
+WebStripper
 WebSucker
 Web Sucker
-WebZIP
-Whatweb
-WinHTTrack
+WebWhacker
+Whacker
+Who.is Bot
+Widow
 Wonderbot
-Woobot
-Wotbox
-WPScan
+Wprecon
 WWW-Collector-E
-x09Mozilla
-Xaldon WebSpider
-Xenu
-Zade
-Zauba
-zauba.io
+WWW::Mechanize
+xpymep1.exe
+YoudaoBot
 Zermelo
-Zitebot
+zgrab
+ZmEu
 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 f388d261e..60e2f4423 100644
--- a/.dev-tools/test_units/random-bots-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-bots-for-whitelist-test.list
@@ -1,250 +1,250 @@
-360Spider
 404checker
 404enemy
+80legs
 Abonti
-Aboundexbot
 Acunetix
+ADmantX
 AfD-Verbotsverfahren
 AhrefsBot
-AIBOT
+AiHitBot
 AlphaBot
-archive.org_bot
+Apexoo
+ASPSeek
 Asterias
-Attach
-autoemailspider
-BackDoorBot
-Backlink-Ceck
-backlink-check
-BacklinkCrawler
 Badass
-Bandit
-Barkrowler
 BatchFTP
-BBBike
 BDCbot
 BDFetch
+Bigfoot
 Bitacle
 Blackboard
 Black Hole
-BlackWidow
-BLEXBot
 Blow
-Bolt
+Boardreader
 Brandprotect
 BuiltBotTough
 BuiltWith
+BunnySlippers
+BuzzSumo
 CATExplorador
-CCBot
+CazoodleBot
+Cegbfeieh
 CheTeam
-coccocbot-web
+ChinaClaw
+Claritybot
+Cliqzbot
+Cogentbot
+Collector
 com.plumanalytics
 Copyscape
+Craftbot
+crawler.feedback
+crawl.sogou.com
 Crescent
-CSHttp
 DatabaseDriverMysqli
 DataCha0s
-Demon
 Deusu
-DIIbot
-Dirbuster
-Disco
-DomainCrawler
-DomainSigmaCrawler
+Devil
+Digincore
+DigitalPebble
+Discobot
+DnyzBot
+DomainAppender
 Dotbot
-Dragonfly
-eCatch
+Download Wonder
+DSearch
+DTS Agent
 Ecxi
-EirGrabber
-EMail Siphon
-EroCrawler
 evc-batch
-Exabot
 Express WebPictures
-Ezooms
-FHscan
-Fimap
+ExtLinksBot
+Extractor
+facebookscraper
+FemtosearchBot
 Firefox/7.0
+Foobot
 Freeuploader
-FyberSpider
-Fyrebot
+FrontPage
+GalaxyBot
 Genieo
+GermCrawler
 GetWeb
-Gigablast
+Gigabot
 G-i-g-a-b-o-t
+GoZilla
+Go!Zilla
 Grabber
-GrabNet
 Grafula
+GrapeFX
+GrapeshotCrawler
 GridBot
-Haansoft
+HaosouSpider
 Havij
+Heritrix
 Hloader
-HTTP::Lite
-Humanlinks
-IDBot
-Id-search
-IlseBot
+HTTrack
+HybridBot
 Image Fetch
-Image Sucker
 IndeedBot
-InfoNaviRobot
-instabid
+InfoTekies
 Intelliseek
-InterGET
+Internet Ninja
+InternetSeer
+internetVista monitor
+ips-agent
 Iria
-JamesBOT
-JennyBot
-JetCar
+IRLbot
+Iskanie
+Jetty
 JikeSpider
-JOC Web Spider
 Jorgee
 JustView
 Keyword Density
+Kozmosbot
+Lanshanbot
 Larbin
-LexiBot
+LeechFTP
 Lftp
-Libwhisker
 LinkextractorPro
-LinkScan
+LinkpadBot
+LinksManager
 LinkWalker
-Lipperhey Spider
+LinqiaScrapeBot
 Litemage_walker
 Lmspider
-LWP::Simple
-Magnet
+LNSpiderguy
+Ltx71
+lwp-request
 Mag-Net
+magpie-crawler
 Mail.RU_Bot
-Majestic-SEO
-meanpathbot
-Meanpathbot
-Mediatoolkitbot
+MarkMonitor
+MarkWatch
+Masscan
+Mass Downloader
+MFC_Tear_Sample
 MIDown tool
-MIIxpc
+Mister PiX
 Mojeek
-Morfeus Fucking Scanner
-MSFrontPage
 Msrabot
+MS Web Services Client Protocol
+muhstik-scan
+Name Intelligence
 Nameprotect
 Navroad
+Needle
+Netcraft
 netEstate NE Crawler
+NetLyzer
 NetMechanic
 NetSpider
 Nettrack
-Net Vampire
 Netvibes
-NetZIP
+NextGenSearchBot
 Nikto
+NimbleCrawler
+Nimbostratus
 Ninja
-Nutch
 oBot
+Octopus
 Offline Explorer
-Offline Navigator
-Openfind
 OpenLinkProfiler
-OrangeBot
+Openvas
+OpenVAS
 OrangeSpider
-OutfoxBot
-Page Analyzer
-PageScorer
-Panscient
+PageGrabber
+page scorer
+Pavuk
+PECL::HTTP
 Picscout
-Pimonster
+Pi-Monster
 Pixray
 PleaseCrawl
 plumanalytics
-POE-Component-Client-HTTP
-ProWebWalker
 Pump
-PxBroker
-RankActiveLinkBot
-RankFlex
-Rankivabot
-RealDownload
-Recorder
-ReGet
-Rogerbot
+QueryN Metasearch
+RankingBot2
+RedesScrapy
+RepoMonkey
+s1z.ru
+SalesIntelligent
 SBIder
+Scanbot
+scan.lol
 ScoutJet
+Scrapy
+Screaming
+Searchestate
 SEOkicks
-SEOlyticsCrawler
-Seomoz
-SEOstats
+seoscanners
+serpstatbot
+sexsearcher
+Shodan
 Siphon
+SISTRIX
 SiteExplorer
 Siteimprove
-SiteSnagger
-SmartDownload
-SMTBot
-Snapbot
-Snoopy
-Sociscraper
-sogouspider
-Sottopop
-SpaceBison
+SiteSucker
+Site Sucker
+SlySearch
+Sogou web spider
 Spammen
-Spanner
-sp_auditbot
-Spbot
-Spinn3r
-spyfu
-Sqlworm
-Stripper
-SuperHTTP
+Sqlmap
+SuperBot
 Surfbot
 SurveyBot
-Suzuran
-Swiftbot
-Szukacz
 T8Abot
+tAkeOut
 Teleport
-TeleportPro
 Telesoft
-Telesphorep
-The Intraformant
-Thumbor
-TightTwatBot
-Titan
-Toweyabot
+Tracemyfile
 Trendiction
-Trendictionbot
-True_Robot
-Turingos
-Turnitin
-Typhoeus
+TwengaBot
 UnisterBot
-Upflow
+URLy.Warning
+Vagabondo
+VB Project
 VCI
 VeriCiteCrawler
-VoidEYE
-Wallpapers/3.0
-WallpapersHD
+Voil
+WBSearchBot
 WebAuto
+Web Auto
+WebBandit
 WebCollage
+WebCopier
 WEBDAV
-WebEnhancer
-Web Fuck
-WebGo IS
-WebImageCollector
-WebmasterWorldForumBot
-webmeup-crawler
+Web Enhancer
+WebFetch
+WebFuck
+WebLeacher
+WebPix
+Web Pix
 WebReaper
 Web Sauger
 Webshag
+WebsiteExtractor
 WebsiteQuester
 Website Quester
-Webster
 WebStripper
-WebWhacker
-Whack
-Whacker
+WebZIP
+WeSEE
 Whatweb
+WinHTTrack
+WiseGuys Robot
+Wonderbot
 Woobot
-Wotbox
+Wprecon
+WPScan
+WWW-Mechanize
+WWW::Mechanize
 WWWOFFLE
+x09Mozilla
 x22Mozilla
 Xaldon WebSpider
 Xaldon_WebSpider
 xpymep1.exe
 YoudaoBot
-Zade
-Zitebot
-ZumBot
+Zauba
+zauba.io
+zgrab
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 5250d2431..bb27d9feb 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 @@
-adclickthru.net
-betune.onlinewebshop.net
-conciergegroup.org
-foto-sisek.porngalleries.top
-freewlan.info
-kredit-blog.ru
-pomoc-drogowa.cba.pl
-sampleletters.net
-sexvporno.ru
-topdownloads.ru
+asrv-a.akamaihd.net
+cougfan.info
+domashneeruporno.com
+faptitans.com
+myindospace.com
+scanner-willy.top
+sierraapps.com
+swingerseiten.com
+tedy.su
+za-music.mymobiplanet.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index db02ddea1..87896e676 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 @@
-0c47f8422d3f.com
-0n-line.tv
-1000n1.ru
-1001watch.com.ua
-123locker.com
-12u.info
-2020iscoming.info
+101lesbian.xyz
+12bet.com
+1314dh.com
+1bet.com
+21h2o.com
+2728fb936f0.com
 2drittel.de
-2girls1cup-free.com
-3-letter-domains.net
+2itech.ru
+2kata.ru
+45en.ru
 4pp13.com
-76brighton.co.uk
-7fon.ru
-aab94f698f36684c5a852a2ef272e031bb.com
-abtasty.com
-actices.com
-adamoads.com
-adelly.bg
+777-club.ru
+8558l.jobs.net
+8xv8.com
+abcguru.xyz
+abctoppictures.net
+academiacsmendoza.org
+adbetclickin.pink
+adcash.com
 adimmix.com
-adinterax.com
-adktrailmap.com
-adman.gr
-ads.gold
-adssafeprotected.com
-adtech.de
-afora.ru
-aliexpress.com
-allbizne.co.ua
-allmarketsnewdayli.gdn
-allnews.md
-angel1777.kz
-animaltoplist.com
-anime.dougasouko.com
-apccargo.com
+ads-cool.pro
+adult-shop.com.ua
+advokateg.xyz
+ad-words.ru
+aghanyna.com
+airmaxshoes-2016.com
+alert-fdm.xyz
+allboard.xobor.de
+all-number.com
+amanda-porn.ga
+amazon-adsystem.com
+anal-acrobats.com
+animal36.com
+animebox.com.ua
 apiappenableinfo-a.akamaihd.net
-apibatbrowsecom-a.akamaihd.net
-apishops.ru
-apispringsmartne-a.akamaihd.net
-apple.com-cleaner.systems
-appsaurus.com
-arabseyes.com
-arcadepages.com
-architecturebest.com
-arclk.net
-arendatora.ru
-arenda-yeisk.ru
-artpicso.com
-arvut.org
-asiengirls.net
-astana.xxxkaz.org
-auto.rusvile.lt
-autotrends.today
-avek.ru
-aversis.net
+apidigidocketnet-a.akamaihd.net
+app5.letmacworkfaster.world
+apple.com-webbrowsing-security.science
+aproposde.com
+arabsexxxtube.com
+arcadeplayhouse.com
+arenanews.com.ua
+arendovalka.xyz
+aruplighting.com
+asophoto.com
+atmagroup.ru
+autobrennero.it
+autodo.info
+autogrep.ru
+autoplate.info
+autowebmarket.com.ua
+avirasecureserver.com
+avkzarabotok.com
+avon-novosib.ru
+avtolombard-krasnodar.ru
 avtovolop.ru
-bablonow.ru
-babs.com.ua
+ayakino.net
+azartclub.org
 baditri.com
-balois.worldbreak.com
-basisches-wasser.net
-bayareaaeroclub.org
-bbtec.net
-bear.gotcher.us
-beatifullandscape.co
+bagcionderlab.com
+baksman.com
+baladur.ru
+bala.getenjoyment.net
+balook.com
+bannerswap.com
+barbourjackets.online
+barnfurnituremart.com
+beclean-nn.ru
+bedandbreakfast.com
 belinka.com.ua
-bg6s0.com
-bibys.com
-bio-market.kz
+bestcurs.org
+bestempresas.es
+bestofpicture.com
+bestprofits-there.com
+best-seo-offer.com
+besttorrentknifta.weebly.com
+beyan.host.sk
+beztuberkuleza.ru
+bfz.biz
+biketank.ga
+bitcoins-live.ru
+biznesrealnost.ru
+blagovest-med.ru
 blockworld.ru
-blog.f00kclan.de
-bmwhighperformers.com
-bolezniorganov.ru
-bonky.biz
-bonzibuddi.com
-bouda.kvalitne.cz
-brandov.ru
-bristolhostel.com
-bryansk.zrus.org
-buron.pw
-business-made-fun.com
-buybest1.biz
-buzzzg.men
-bvlgaribracelet.xyz
-bvlgariwallet.xyz
-cakemediahq.com.au
-calc-for-credit.ru
-canrioloadm.gq
+blog-hits.com
+blogrankers.com
+boleznikogi.com
+bonzbuddy.com
+bookhome.info
+bookmark4you.com
+bukleteg.xyz
+buqyxa.rincian.info
+burger-imperia.com
+buy-forum.ru
+buyk.host.sk
+buytizanidineonlinenoprescription.blogspot.com
+buzzsumo.com
+californianews.cf
+callcafe.info
+callstevens.com
 canzoni.ru
-carson.getenjoyment.net
-cartierjusteunclou.xyz
-cartierreplica.win
-cb.iphantom.com
-celebsopics.com
-c-english.ru
-checkpagerank.net
-chiptuninger.com
-cigarpass.com
-cjs.com.ru
-clickbanksites.info
-cognitiveseo.com
-coldfilm.ru
-compliance-alexa.top
-compliance-alex.xyz
-compliance-donald.xyz
-compliance-don.top
-compliance-george.xyz
-constantaservice.net
-cookingmeat.ru
-cottageofgrace.com
-counter.bloke.com
-counter.yadro.ru
-crystalslot.com
-cs-passion.pl
-dandiyabeats.in
-dangphoto.trade
-dekorkeramik.ru
-delayreferat.ru
-diarioaconcagua.com
-dimaka.info
-dispo.de
-documentbase.net
-domini.cat
-donna7753191.ru
-dosug-lux.ru
-druzhininevgeniy63.blogspot.com
-dyt.net
-ecommerce-seo.org
+cardiosport.com.ua
+cardsharp1.ru
+cartierbraceletsreplica.pw
+cartierlovebracelet.xyz
+casite-513049.cloudaccess.net
+ccbill.com
+cete.ru
+cheatcode-lita12.rhcloud.com
+cindymatches.com
+cleanallspyware.com
+clean-start.net
+clickaider.com
+clksite.com
+club-lukojl.ru
+compliance-alex.top
+compliance-fred.xyz
+compliance-mary.top
+concealthyself.com
+conocer-sanabria.com
+cookie-law-enforcement-ff.xyz
+coolingoods.com
+coolwallpapers-hd.com
+cool-wedding.net
+cordstrap.cc
+craftburg.ru
+cypernhuset.se
+day-news.info
+derevesendeco.com
+descargar-musica-gratis.net
+detskie-konstruktory.ru
+diamond-necklace.info
+dieswaene.com
+dinkolove.ya.ru
+discovertreasurenow.com
+disruptingdinnerparties.com
+dividendo.ru
+divisioncore.com
+dnsrsearch.com
+docs4all.com
+domaincrawler.com
+domain-submit.info
+domain.webkeyit.com
+domoysshop.ru
+downloadmefiranaratb1972.xpg.com.br
+dprtb.com
+dustyorate.com
+earthmagic.info
+ecxtracking.com
+edudocs.net
 eladkarako.com
 eldiariodeguadalajara.com
-elektrischeziga.livejournal.com
-elektrozigaretten1.tumblr.com
-elitedollars.com
+electricwheelchairsarea.com
 elstal.com.pl
-empis.magix.net
-enews.tech
-eng-lyrics.com
-erot.co
+eluxer.net
+enbersoft.com
+engines-usa.com
 erotik-kostenlos.net
-estelight.ru
-etotupo.ru
-everflora.ru
-everytalk.tv
-excitacao.com
-extrabot.com
-ezigarettekaufen2.yolasite.com
-fba-mexico.com
-fickenbumsen.net
-filefilter.weebly.com
-filesdatabase.net
-filesmonster.porn
-filmci.pro
-film-one.ru
-find1friend.com
-firesub.pl
-fitness-video.net
-flashlarevista.com
-flavors.me
-forum.doctissimo.fr
-forum.poker4life.ru
-forumprofi.de
-fotosfotos.eu
-fotzen-ficken.com
-franch.info
-freejabs.com
-freelotto.com
-freenom.link
-freewlan.info
-fusoradio.info
-fyl.com.ru
-fym.com.ru
+esfchat.tk
+este-line.com.ua
+euromasterclass.ru
+europages.com.ru
+executehosting.com
+expresstoplivo.ru
+extractorandburner.com
+eyes-on-you.ga
+fable.in.ua
+facecup.top
+familyphysician.ru
+famix.xyz
+fantasticpixcool.com
+farmingworm.com
+fashionavenuegame.com
+fellowshipoftheminds.com
+ferieboligkbh.dk
+financehint.eu
+firstdrugmall.ru
+fm-upgrade.ru
+forexunion.net
+free-social-buttons.com
+free-video-tool.com
+freshmac.space
+frustrated-favorable.gq
+fullfileaccess.com
 galaxy-family.ru
-galeon.com
-game300.ru
-gamesprite.me
-gaming-journal.com
-gdebestkupit.ru
-genericlowlatencyasiodriverhq.aircus.com
-getridofstretchmarks.org
+gallerylisting.com
+gameonasia.com
+gamerextra.com
+gearcraft.us
+generousdeal-a.akamaihd.net
+genetworx.com
+ghostvisitor.com
 girlsatgames.ru
-girlspicsa.com
-globalscam.ga
 gok-kasten.net
-golaya.pw
-goldadpremium.com
-golden-catalog.pro
+goodprotein.ru
+goodwinmetals.co
 googlemare.com
-googlepositions.com
-googlsucks.com
+goo.ne.jp
 gosarhivrt.ru
-graphicwe.org
-gratuitxblcodes.com
-greatzip.com
-gwhwpxbw.bloger.index.hr
-helicalpile.us
+gotomontenegro.net
+gourcy.altervista.org
+greatfind-a.akamaihd.net
+greenidesign.co
+gribkovye-zabolevaniya.com
+handsandlegs.ru
+happy.new.yeartwit.com
+hard-porn.mobi
+hd720kino.ru
+heliko.no
+hermesbelts.xyz
+heroz.fr
+hetmanship.xyz
+historichometeam.com
 hobbyhuren24.net
-hornymatches.com
-hotblog.top
-hotkeys.com
-housemilan.ru
-houston-vikings.com
-huhn.altervista.org
-hustoon.over-blog.com
-hyiphunter.org
-iamsport.org
-iboss.com
-ideibiznesa2015.ru
-ifirestarter.ru
-igrovyeavtomaty777.ru
-ilbe.club
-ilikevitaly.com
-imagefinder.site
-imagerydatabase.com
-iminent.com
-imk.com.ua
-impotentik.com
-impresagaia.it
-infektsii.com
-internetartfair.com
-ipornox.xxx
-iqoption.pro
-iyasimasennka.com
-j33x.com
-jagg.info
-james13prix.info
-janettabridal.com
-jerseysbizwholesalecheap.com
-johannesburgsingles.co.za
-jongose.ninja
-kambasoft.com
+homedo.fabpage.com
+homemature.net
+hostingclub.lk
+hotchatdate.com
+hotel-mkad.ru
+housediz.com
+hoverboard360.at
+huimin764128.com
+ibmdatamanagement.co
+iinstalll-fii1leis.jus0wil.pp.ua
+ilovevitaly.xyz
+imagine-ex.co
+immobiliaremassaro.com
+instabid.tech
+intelhdgraphicsgtdrive6w.metroblog.com
+interesnie-faktu.ru
+iqbazar.ru
+isitpaleo.info
+jasonpartington.com
+javitas.info
+javrip.net
+journalhome.com
+jovencitas.gratis
+juliadiets.com
 kam-dom.ru
-kamorel.com
-kandidos.com
-kanimage.com
-karaganda.xkaz.org
-katadhin.co
-kchaxton.com
-kichenaid.ru
-kicknights.gq
+kerwinandcariza.com
 kinocccp.net
-kinotorka.ru
-kochanelli.com
-komputers-best.ru
-konturkrasoty.ru
-kraljeva-sutjeska.com
-krasnodar.ru
-kuzinsp.ru
-kwzf.net
-landinez.co
-lankarns.com
-laserpen.club
-layola.biz.tc
-ledis.top
+kinoduh.ru
+kinogolos.ru
+klumba55.ru
+knogg.net
+kol-energo.ru
+kollekcioner.ru
+kolotiloff.ru
+koopilka.com
+kosmetyki.tm.pl
+kosynka-games.ru
+krasnodar.xrus.org
+kvartiry-remont.ucoz.ru
+lafourmiliaire.com
 lennatin.info
-letsart.ru
-lietaer.com
-lifebyleese.com
-liffa.ru
-liky.co.ua
-lion.snapmap.us
-lisque.batcave.net
-live-sexchat.ru
-locimge.pw
-lonely-mature.com
-lubetube.com
-lunamedia.co
-lyrster.com
-macdamaged.tech
-mackeeper-land-672695126.us-east-1.elb.amazonaws.com
-mailemedicinals.com
+lernur.net
+letmacworkfaster.site
+libertybilisim.com
+lignofix.ua
+likesdesign.com
+lincolntheatre.com
+lion.conboy.us
+liran-locks.com
+liverpool.gsofootball.com
+llastbuy.ru
+loadingpages.me
+localflirtbuddies.com
+lolnex.us
+longadventure.com
+louboutinreplica.xyz
+luckyshop.net.ua
+lunchrock.co
+m292.info
 makemoneyonline.com
-makis.nu
-malwareremovalcenter.com
-manyresultshub-a.akamaihd.net
-marcowebonyodziezowe.pl
-marinetraffic.com
-marketland.ml
-masturbate.co.uk
-matpre.top
+manimpotence.com
+matb3aa.com
 matsdale.com
-maxthon.com
-mazda-roadsters.com
-mcnamaratech.com
-medkletki.ru
-meet-flirt-dating.com
+mcadamssupplyco.com
+mebel-alait.ru
+medi-fitt.hu
+medispainstitute.com.au
+medizinreisen.de
 mega-bony2017.pl
-mhi-systems.ru
-michaelkorssaleoutletonline.net
-miniads.ca
-mncrftpcs.com
-modabutik.ru
-mokrayakiska.com
-mole.pluto.ro
-moneytop.ru
-moscow-region.ru
-mriyadh.com
-muschisexbilder.com
-musflashtv.com
-music7s.me
+metabar.ru
+mexicotravelnet.com
+mini.7zap.com
+mlvc4zzw.space
+moi-glazki.ru
+monclerjacketsoutlet.win
+mosdverka.ru
+mowser.com
+mrbojikobi4.biz
+mtmtv.info
+muabancantho.info
+muizre.ru
 musicdaddy.net
-muz-baza.net
-mystats.xyz
-narkologiya-peterburg.ru
-nash-krym.info
-netanalytics.xyz
-new-post.tk
-nhl17coinsforps3.gratisblog.biz
-niroo.info
-no-fuel.org
-npoet.ru
-nuup.info
-o-dachnik.ru
-offers.bycontext.com
-okel.co
-omoikiri-japan.ru
-opinionreelle.com
-osb.se11.ru
-ourville.info
-ownshop.win
-paleohub.info
-panchro.co.uk
-pelfind.me
-pensplan.com
+musicspire.online
+musicvidz.ru
+muz-shoes.ru
+mvpicton.co.uk
+mybinaryoptionsrobot.com
+mydirtystuff.com
+myindospace.com
+myperiod.club
+myyour.eu
+nextlnk12.com
+nextrent-crimea.ru
+nfljerseyscheapbiz.us
+nikkiewart.ru
+nippon-bearings.ru
+notebook-pro.ru
+novatech.vn
+november-lax.com
+nrv.co.za
+offside2.5v.pl
+okmusic.jp
+oksrv.com
+ok-ua.info
+oneclickfiles.com
+onlinebay.ru
+onlinefilmz.net
+onlythegames.com
+ops.picscout.com
+ordernorxx.com
+outclicks.net
+outrageousdeal-a.akamaihd.net
+oynat.info
+paidonlinesites.com
+paperwritingservice17.blogspot.ru
+paydayonlinecom.com
 perfection-pleasure.ru
-perfectpracticeweb.com
-perm-profnastil.ru
-petitions.whitehouse.gov
+phobia.us
 photo-clip.ru
-picture-group.com
-picurams.pw
-pixell.club
+photostudiolightings.com
+picmoonco.pw
+pinsdaddy.com
+pkr1hand.com
+plastweb.ru
+plugingeorgia.com
+pokerniydom.ru
 polcin.de
-popunder.ru
-popup-fdm.xyz
-porno-dojki.net
-pornokorol.com
-pornonik.com
-pornophoto.xyz
-prizesbook.online
-produkto.net
-profolan.pl
-prointer.net.ua
-projefrio.com.br
-prokotov.com
-promgirldresses.xyz
-promoheads.com
-prospekt-st.ru
-prostitutki-kiev.org
-ptr.ruvds.com
-qwarckoine.com
-ragecash.com
-rapevideosmovies.com
-rednise.com
-registry-clean-up.net
+polytopesexempt.com
+pony-business.com
+popup.matchmaker.com
+porndairy.in
+pornoblood.com
+pornoklad.ru
+pornoreino.com
+porno.simple-image.com.ua
+pornotubs.com
+powc.r.ca.d.sendibm2.com
+pozdrawleniya.ru
+pr0fit-b0x.com
+presleycollectibles.com
+privetsochi.ru
+prodess.ru
+pro-poly.ru
+prostitutki-belgoroda.org
+prostitutki-yaroslavlya.org
+push-ad.com
+pwwysydh.com
+quickbuck.com
+realnye-otzyvy.info
+rebelmouse.com
+rebrand.ly
+rebuildermedical.com
+redirlock.com
 reklama1.ru
-reklamuss.ru
-remontbiz.ru
-remontgruzovik.ru
-rent2spb.ru
-rep-am.com
-riders.ro
-ring4rhino.com
-ruspdd.com
+reklama-i-rabota.ru
+remorcicomerciale.ro
+replicaclub.ru
+replica-watch.ru
+ritlweb.com
+running-line.ru
+russia-tao.ru
+russintv.fr
 rutor.vip
-sack.net
-saecsa.co
-sandhillsonline.com
-sarf3omlat.com
-satellite.maps.ilovevitaly.com
-scanner-alexa.top
-scanner-george.top
-scanner-marwin.top
-scansafe.net
-scmor.ilxc.cc
-sdelai-prosto.ru
-searchwebknow-a.akamaihd.net
-securityallianceservices.com
-selectads.men
-sel-hoz.com
-semalt.com
-sendearnings.com
-seoholding.com
-seorankinglinks.us
-servethis.com
-serviporno.com
-sexfreepornoxxx.com
-sexpornotales.com
-sex-pr.net
-sexreliz.com
-sexy-screen-savers.com
-shoesonlinebuy.cn
-shoesonlinebuy.xyz
-shtaketniki.kz
-sideeffectsoftizanidine.blogspot.com
-signal03.ru
-silvercash.com
-site3.free-share-buttons.com
-sivs.ru
-sky-mine.ru
-sledstvie-veli.net
-sluganarodu.ru
-small-game.com
-sobecjvuwa.com.ru
-social-fun.ru
-soheavyblog.com
-soserfis.com
-soundfrost.org
-space-worry.ml
-spidtest.space
-spin2016.cf
-sprttrack.com
-spy-app.info
-startufa.ru
-stevemonsen.com
-stjamesschool.info
-strangeduckfilms.com
-supermesta.ru
-svarbit.com
-swagbucks.com
-tabletkinaodchudzanie.com.pl
-tagil.zrus.org
-tattooreligion.ru
-tds-advert005.info
-tehngr.ru
-telsis.com
+saneyes.com
+sarafangel.ru
+saveindex.xyz
+sbdl.no
+sbricur.com
+scanner-jessica.top
+scat.porn
+sdrescher.net
+searchlock.com
+seasonvar.ru
+seeingmeerkat.com
+segol.tv
+seinterface.com
+seorankinglinks.com
+seorussian.ru
+serialsway.ucoz.ru
+sextracker.de
+sexytrend.ru
+sfd-chess.ru
+sherlock.se
+shillyourcoins.com
+shinikiev.com.ua
+shlyahten.ru
+shodanhq.com
+similardeals.net
+site-speed-check.site
+smart-balancewheel.com
+socialmadesimple.com
+socialseet.ru
+solution4u.com
+sosdepotdebilan.com
+spasswelt.xyz
+specialfinanceoffers.com
+spywarenuker.com
+stairliftstrue.com
+statoutlook.info
+sticken.co
+stroilka.info
+suggest-keywords.com
+superfish.com
+svetlotorg.ru
+svnuppsalaorebro.se
+swsociety.se
+symphonyintegratedhealthcare.com
+takeprofitsystem.com
+taqywu51.soup.io
+td-l-market.ru
+technopellet.gr
+teguh.info
+telegraf.by
 thegioixekhach.com
-themestotal.com
+theheroes.ru
 thepantonpractice.co.uk
-threecolumnblogger.com
-tizanidinecost.blogspot.com
-tizanidinehcl4mgisitanarcotic.blogspot.com
-tizanidinehclsideeffects.blogspot.com
-tizanidinemusclerelaxant.blogspot.com
-tmtrck.com
-tour-line.net
-traffixer.com
-truck-land.life
+thetoiletpaper.com
+timetorelax.biz
+tizanidinewithdrawalsymptoms.blogspot.com
+tomck.com
+top-karkas.ru
+topvidos.ru
+torontoplumbinggroup.com
+torrent-to-magnet.com
+tourcroatia.co.uk
+tpu.ru
+traffic2money.com
+traffmonster.info
+traffpartners.com
+trahvid.com
+trailer.cinemaflix.website
+truemfilelj.gq
+trustl.life
+tupper-shop.ru
+turbabitload.weebly.com
 tzritel.tk
-uamtrk.com
-ublaze.ru
-ultimateclassicrock.com
-umekana.ru
-urzedowski.eu
-usswrite.com
-utrolive.ru
-uytmaster.ru
-v24s.net
-vashsvet.com
-vekzdorov.ru
-vereo.eu
-via-energy-cumpara.com
-via-energy-order.com
-viagra-soft.ru
-videochat.tv.br
-videojam.tv
-videos-for-your-business.com
-vip-dom.in
-vkgaleria.com
-vremya.eu
-vut.com.ru
-wait3sec.org
-wallpapersist.com
-we-are-gamers.com
-webinstantservice.com
-weblo.com
-webmonetizer.net
-webpromotion.ae
-webstatsdomain.org
-wellcome2slovenia.ru
-westum.se
-wingsofrefuge.net
-wiosenny-bon-1500.pl
-wordpresscore.com
-wosik-dach.service-for-web.de
-wowas31.ucoz.ru
-www.event-tracking.com
-x69ty.ru
-xfire.com
-xgftnlrt.bloger.index.hr
-xmlinde.com
-xn----7sbbagbq7bd5aheftfllo4m.xn--p1ai
+univerfiles.com
+unlimitdocs.net
+us-america.ru
+usdx.us
+ussearche.cf
+vapeface.club
+viddyoze.com
+visitcambridge.org
+vladimir.zrus.org
+voluumtrk.com
+vucms.com
+wahicbefa31.soup.io
+wallpaperstock.net
+warningzscaler.heraeus.com
+watsonrealtycorp.com
+webenlace.com.ar
+website-datenbank.de
+website-speed-check.site
+webtherapy.ru
+whatsupinfoley.com
+whipme.yopoint.in
+white-truck.life
+whosonmyserver.com
+wingsoffury2.com
+worldtraveler.world
+wpsecurity.website
+xedserver.com
+xn--80ab4aa2g.xn--p1ai
 xn--80ahdheogk5l.xn--p1ai
-xn--80ahvj9e.xn--p1ai
-xn--80aikhbrhr.net
-xtrafficplus.com
-xvideosbay.com
-yebocasino.co.za
-youandcredit.ru
-yougame.biz
-youjizz.com
-zakazfutbolki.com
-zaloro.com
-zarepta.com
-znakomstva-piter78.ru
-zocaparj.kz
-zog.link
+xn----ctbigni3aj4h.xn--p1ai
+xn--d1aifoe0a9a.top
+xportvusbdriver8i.snack.ws
+x-rates.ru
+youbloodyripper.com
+youdesigner.kz
+youporn-ru.com
+yourserverisdown.com
+yourtemplatefinder.com
+youtuhe.com
+zahvat.ru
+zeikopay.com
+zerocash.msk.ru
+zeroredirect12.com
+zhorapankratov7.blogspot.com
+zigzog.ru
+zolotoy-lis.ru
 zone-kev717.info
-zoogdiesney.com
-zooggames.com
-zrus.org
-zs2vm.top
+zoompegs.com
+zvetki.ru
+zynax.ua
diff --git a/.dev-tools/test_units/random-referrers-for-whitelist-test.list b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
index 952b9658e..e3ecd456f 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 @@
-108shot.com
-1-99seo.com
-2pxg8bcf.top
-3xforum.ro
-aaa38852e886ac4af1a3cff9b47cab6272.com
-aadroid.net
-adloads.net
-ads-cool.pro
-adzerg.com
-aero2.ru
-agreda.pluto.ro
-aimayangzhi.com
-alkoravto.ru
-all4wap.ru
-aloofly.com
-animal36.com
-animal-drawings.com
-animebox.com.ua
-apple.com-webbrowsing-security.review
-autorn.ru
-azazaporn.com
-azlex.uz
-bag77.ru
-best-businessman.ru
-bestcalovebracelet.cn
-bestdraws.com
-bestimagecoollibrary.com
-bikini-image.com
+1001watch.com.ua
+2nt.ru
+3w24.com
+91abcw.com
+aad1f4acb0a373420d9b0c4202d38d94fa.com
+adult3dgames.com
+airmaxshoes-2016.com
+allmarketsnewdayli.gdn
+aludecor.info
+angigreene.com
+animalia-life.club
+appartement-stumm.at
+applicationg29.com
+apps-analytics.net
+arenanews.com.ua
+arius.tech
+asmxsatadriverin.aircus.com
+asociatia-tipografilor-transilvania.ro
+australia-opening-times.com
+auto.rusvile.lt
+awaybird.ru
+beget.tech
+bget.ru
 birzha-truda.eu
-blackcurranthumidifiers.site
-blog.f00kclan.de
-bloggedporn.com
-blogrankers.com
-brainsandeggs.blogspot.com
-b-styles.xyz
-callstevens.com
-canrole.com
-cdncash.com
+bitcoinpile.com
+bmsco.co
+brandbucket.com
+brendbutik.ru
+browserprotecter.com
+buydissertation.net
+buypanicdisorderpill.com
+buyparajumpers.online
+canyougethighofftizanidine.blogspot.com
 cdncash.net
-cercacamion.it
-charmstroy.info
-cityadspix.com
+cellfun.mobi
+centraletermice.us
+cheapsergiorossi.online
+cibpenonptib.flu.cc
+cigarpass.com
+cleanersoft.com
 clipartnew.com
-cl.s7.exct.net
-clubfashionista.com
-compliance-elena.top
-cookie-law-enforcement-hh.xyz
-copyrightclaims.org
-craftinsta.ru
-creatives.adbetclickin.pink
-customcatchcan.com
-deanmoore.ie
-decoratinghomes.ga
-decorationspcs.com
-designdevise.com
-eandsgallery.com
-edge.sharethis.com
-ekspresihati.info
-ekto.ee
-elektrischezigarettekaufen2.cowblog.fr
-elektrozigarettekaufen1.devhub.com
+compliance-andrew.xyz
+compliance-irvin.xyz
+compliance-josh.top
+cookie-law-enforcement-aa.xyz
+coolgamechannel.com
+cordstrap.cc
+covadhosting.biz
+cowlmash.com
+deshevo-nedorogo.ru
+dieswaene.com
+dildofotzen.net
+discovertreasurenow.com
+dneprsvet.com.ua
+drivotracker.com
+druzhininevgeniy63.blogspot.com
+e-collantes.com
+educatemetv.com
+elitedollars.com
 enews.tech
-european-torches.ru
-exonline.info
-eyessurgery.ru
-ezigarettekaufen2.yolasite.com
-f1nder.org
-f5mtrack.com
-favornews.com
-ferretsoft.com
-fetishinside.com
-fickenbumsen.net
-finuse.com
+enthuse.computernetworksonline.com
+factorynightclub.com
+fearcrow.com
+fillmewithhappiness.com
+findpik.com
+finteks.ru
+flash4fun.com
+f-online.de
+fotopop.club
+freelotto.com
 fx-brokers-review.com
-gaygalls.net
-gaytube.com
-gcup.ru
-gilsonchiro.xyz
-goodnightjournal.com
-greenidesign.co
-gribokstop.com
-havepussy.com
-hcate.com
-hdseriale.pl
-headpharmacy.com
-hikesearch.net
-howlongdoestizanidinestayinyoursystem.blogspot.com
-indiakino.net
-irkutsk.online-podarki.com
-iskalko.ru
-ixora.pro
-jus0wil.pp.ua
-kakadu-interior.com.ua
-kaz.kz
-ketoanhanoi.info
-keyhantercume.com
-kichenaid.ru
-kiwe-analytics.com
-kletkimehan.ru
-kollekcioner.ru
-krasnodar.xrus.org
-kriokomora.info
-kustanay.kz
-languagecode.com
-laxob.com
-legionalpha.com
-life.biz.ua
-lmrauction.com
-locimge.pw
-lockerz.com
-lonely-mature.com
-lostfilm-online.ru
-lutherstable.org
-malls.com
-mecash.ru
-medictube.ru
-medizinreisen.de
-mexicosleevegastrectomy.com
-mexicotravelnet.com
-minet.club
-moesen-ficken.com
-moinozhki.com
-moroccosurfadventures.com
-moyaterapiya.ru
-mrcsa.com.au
+fz139.ttk.ru
+gallictures.com
+gambarkataku.co
+game-mmorpg.net
+gameplexcity.com
+gay.adultgalls.com
+gay-file.com
+gazobeton-p.com.ua
+getprismatic.com
+getresponse.com
+ggiaro.com
+girlporn.ru
+gktt.ru
+glicol.kz
+global-ics.co.za
+gojiberriess.apishops.ru
+goosefishpost.bid
+gov.yanao.ru
+gungamesz.com
+hawaiielectriclight.com
+help.tpu.ru
+hidemyass.com
+hostcritique.com
+hoverboard360.nl
+hplaserjetpdriver8y.pen.io
+https-legalrc.biz
+huimin764128.com
+ictizanidinehcl4mg.blogspot.com
+iloveitaly.ru
+ilovevitaly.ru
+img.wallpaperstock.net
+intermesh.net
+internetartfair.com
+it-max.com.ua
+iweblist.info
+jacago.com
+janerikholst.se
+jolic2.com
+journalhome.com
+justdating.online
+keywordsking.com
+kimcurlrvsms.com
+kino-rating.ru
+kiwi237au.tk
+larchik.net
+laudit.ru
+law-check-two.xyz
+legalrc.biz
+lifehacĸer.com
+liffa.ru
+lomb.co
+mactechinfo.info
+magnetic-bracelets.ru
+maridan.com.ua
+massage-info.nl
+mature.free-websites.com
+mebelcomplekt.ru
+meddesk.ru
+metabar.ru
+mirobuvi.com.ua
+moneyviking-a.akamaihd.net
+moz.com
+mug-na-chas-moscow.ru
 multgo.ru
-muztops.ru
-mycaf.it
-myseoconsultant.com
-narosty.com
-nikitabuch.com
-onlinetvseries.me
-osnova3.ru
-partnerline.men
-patol01.pw
+mundoaberrante.com
+musicspire.online
+musirc.com
+myprintscreen.com
+myyour.eu
+narkologiya-voronezh.ru
+natali-forex.com
+nbsproject.ru
+newstudio.tv
+nordstar.pro
+offf.info
+office2web.com
+of-ireland.info
+o.light.d0t.ru
+onemactrckr.com
+panchro.co.uk
+paradontozanet.ru
+partner-cdn.men
+petedrummond.com
+petrovka-online.com
 phpdevops.com
-pix24x7.com
-pizdopletka.club
-playtap.us
-plugingeorgia.com
-pooleroadmedicalcentre.co.uk
-popugaychiki.com
-porndroids.com
-pornogig.com
+pogodnyyeavarii.gq
+popads.net
+porndl.org
+pornoblood.com
+pornodojd.ru
 pornolook.net
-pornotubs.com
-pricheski-video.com
-profitwithalex.info
-projectforte.ru
-promoheads.com
-pronorm.fr
-prostitutki-rostova.org
-purplesphere.in
-quickchange.cc
-rabotaetvse.ru
-ranksays.com
-razamicroelectronics.com
+porno.simple-image.com.ua
+portnoff.od.ua
+prosmibank.ru
+prospekt-st.ru
+prostitutki-almata.org
+psvita.ru
+pulse33.ru
+purplestats.com
+questionmarque.ch
+ranksonic.org
+rasteniya-vs-zombi.ru
+rebelmouse.com
 registratciya-v-moskve.ru
-rentalcarnavi.info
-rentaremotecomputer.com
-ringtonepartner.com
-russian-postindex.ru
-santasgift.ml
-saugatuck.com
-scanner-brian.top
-scopich.com
-scripted.com
-seoboxes.com
-seofirmreviewsus.info
-seoholding.com
-seomarketings.online
-seorank.info
-serving.adbetclickin.pink
-sexkontakteao.info
-sextracker.de
-sexy-pings.com
-sexytrend.ru
-shopvilleroyboch.com.ua
-sirpornogratis.xxx
-sitopreferito.it
-skladvaz.ru
-skytraf.xyz
-slavic-magic.ru
-slowmac.tech
-solmarket.by
-solnplast.ru
-soserfis.com
-sotkal.lark.ru
-sovetogorod.ru
+remont-fridge-tv.ru
+responsinator.com
+rewardpoll.com
+rocketchange.ru
+roma-kukareku.livejournal.com
+sack.net
+sady-urala.ru
+saltspray.ru
+samara.rosfirm.ru
+saneitconsulting.com
+sbdl.no
+scanner-don.top
+securityallianceservices.com
+sethrollins.net
+sex-pr.net
+sexsearch.com
+sexyteens.hol.es
+sfj-ror.no
+shop-electron.ru
+shoppingmiracles.co.uk
+shop.xz618.com
+skyway24.ru
+slavia.info
+small-game.com
+sortthemesitesby.com
 spb-plitka.ru
-squidoo.com
-stathat.com
-strag-invest.ru
-stroyhelp-dv.ru
-superinterstitial.com
-sureone.pro
-survival.betteroffers.review
-svarbit.com
-svetodiodoff.ru
-svolze.com
-taqplayer.info
-taqywu51.soup.io
-taraz.xkaz.org
-tedxrj.com
-thenetinfo.com
-tizanidineandcipro.blogspot.com
-tizanidinehcl4mgtablet.blogspot.com
-tizanidineoral.blogspot.com
-tizanidineshowupondrugtest.blogspot.com
-tkanorganizma.ru
-topbestgames.com
-traffique.net
-traffixer.com
-trk-4.net
-truck-addzilla.life
-tytoona.com
-v720hd.ru
-validdomain.xyz
-valsalud.com
-vektorpress.ru
-venta-prom.ru
-via-energy-cumpara.com
-voluumtracker1.com
-vote-up.ru
-vriel.batcave.net
-vsesubwaysurfers.com
-wallpapersdesk.info
-webmasters.stackexchange.com
-webnode.me
-webshoppermac.com
-whatistizanidine2mg.blogspot.com
-whengirlsgowild.com
-white-truck.life
+stardevine.com
+studiofmp.com
+sundrugstore.com
+surintech.ac.th
+svensk-poesi.com
+swinon.site
+t-bygg.com
+textads.men
+thegameriders.com
+the-torrent-tracker.blogspot.com
+top250movies.ru
+top-karkas.ru
+trackmedia101.com
+traffic2cash.org
+traffic2money.com
+traffic-club.info
+trafficjunky.com
+trafficreceiver.club
+trucri.me
+tula.howotorg.ru
+tupper-shop.ru
+ukrup.com
+uni.me
+unmaroll.ya.ru
+unrealcommander.com
+uprour.com
+urll.eu
+urzedowski.eu
+userequip.com
+vilingstore.net
+vip.51.la
+vzglyadriv.kg
+wareseeker.com
+watchinf.com
+webix.biz
+webstatsdomain.org
+welcomeauto.ru
+wemedinc.com
+wesharepics.site
+whipme.yopoint.in
 wingsofrefuge.net
-worldtraveler.world
-wosik-dach.service-for-web.de
-wpsecurity.website
-xn----7sbifcamovvfggw9d.xn--p1ai
-xn--b1agm2d.net
-xn--d1abj0abs9d.in.ua
-xxxkaz.org
-xxxtube69.com
-yaderenergy.ru
-youbrainboost.asia
-zajm-zalog-krasnodar.ru
-zaloadi.ru
-zhacker.net
-zigarettenonlinekaufen1.blox.pl
-zolotoy-lis.ru
-zootoplist.com
+worldlovers.ru
+xn----8sbdbjgb1ap7a9c4czbh.xn--p1acf
+xn----btbdvdh4aafrfciljm6k.xn--p1ai
+zebradudka.com
+zixizop.net.ru
+zmoda.hostreo.com
+zojirushi-products.ru
+zophim.me
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index a7215fb74..f371d9e5f 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.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/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index c3c284efc..3dac4f84e 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;
+35.192.187.174	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 1b1caa08e..b9e1a95a8 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 accb41120..6b0f858c0 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 ed1925d97..bb41e6a7c 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1724
+#### Version: V4.2019.07.1726
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index acca578b2..075e3e245 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1724
+#### Version: V4.2019.07.1726
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index d0e223cdd..10124a700 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.1724
+#### Version: V4.2019.07.1726
 #### 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 92dd9a6e2..1a74c0dd9 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.1724
+#### Version: V4.2019.07.1726
 #### 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 7ed156054..985914f0a 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.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 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 5587fdfc9..b2ae71280 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.1724
-### Updated: Mon Jul  1 16:26:57 SAST 2019
+### Version: V3.2019.07.1726
+### Updated: Mon Jul  1 17:07:08 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index 7ed156054..985914f0a 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1724
-### Updated: Mon Jul  1 16:26:56 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:07 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index ac6f759c1..8778b6f19 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1724
-### Updated: Mon Jul  1 16:26:58 SAST 2019
+### Version: V4.2019.07.1726
+### Updated: Mon Jul  1 17:07:10 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##