diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index 6e728f367..7de8efe9e 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.1744
-### Updated: Wed Jul  3 15:06:57 SAST 2019
+### Version: V3.2019.07.1745
+### Updated: Wed Jul  3 15:34:01 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 689d439aa..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 @@
-34.66.178.120	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 34cb39aec..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 @@
-34.66.178.120	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 6e728f367..7de8efe9e 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.1744
-### Updated: Wed Jul  3 15:06:57 SAST 2019
+### Version: V3.2019.07.1745
+### Updated: Wed Jul  3 15:34:01 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 689d439aa..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 @@
-34.66.178.120	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 34cb39aec..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 @@
-34.66.178.120	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 6e728f367..7de8efe9e 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.1744
-### Updated: Wed Jul  3 15:06:57 SAST 2019
+### Version: V3.2019.07.1745
+### Updated: Wed Jul  3 15:34:01 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 689d439aa..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 @@
-34.66.178.120	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 34cb39aec..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 @@
-34.66.178.120	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 6e728f367..7de8efe9e 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.1744
-### Updated: Wed Jul  3 15:06:57 SAST 2019
+### Version: V3.2019.07.1745
+### Updated: Wed Jul  3 15:34:01 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index 6e728f367..7de8efe9e 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1744
-### Updated: Wed Jul  3 15:06:57 SAST 2019
+### Version: V3.2019.07.1745
+### Updated: Wed Jul  3 15:34:01 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index 8927a1cdc..e125a9747 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 f0d7ffecc..cb2425fb6 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.192.187.174          0;
+35.184.96.71            0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index 8927a1cdc..e125a9747 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 2e2965ffc..5e7c0ed8e 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.188.73.34	1;
+35.184.226.236	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index d3d331ed4..3e60bde86 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.188.73.34	0;
+35.184.226.236	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
index 8927a1cdc..e125a9747 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 2e2965ffc..5e7c0ed8e 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.188.73.34	1;
+35.184.226.236	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index d3d331ed4..3e60bde86 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.188.73.34	0;
+35.184.226.236	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
index 8927a1cdc..e125a9747 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 2e2965ffc..5e7c0ed8e 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.188.73.34	1;
+35.184.226.236	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
index d3d331ed4..3e60bde86 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.188.73.34	0;
+35.184.226.236	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
index 8927a1cdc..e125a9747 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 f0ec4e3ed..492992b94 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.188.73.34            0;
-104.154.113.151         0;
+35.184.226.236          0;
+35.188.1.99             0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index 2a34ca6b0..4b6738f55 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
index 609eaa6a6..2b16326a1 100644
--- a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.188.73.34            0;
-35.192.187.174          0;
+35.184.226.236          0;
+104.154.120.187         0;
diff --git a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
index 5571c8674..c8c291164 100644
--- a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 59c709da3..9e34bc49b 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,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
-104.198.131.58          0;
-35.192.136.167          0;
-35.188.73.34            0;
+35.188.1.99             0;
+104.154.120.187         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 8927a1cdc..e125a9747 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### 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 768fa8ff8..34f18243f 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,6 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.192.136.167          0;
-34.66.178.120           0;
-35.188.73.34            0;
+35.224.112.202          0;
+35.188.1.99             0;
+35.192.85.2             0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index 8927a1cdc..e125a9747 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 689d439aa..90fe4f9d3 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-34.66.178.120	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 97b6b5301..f9d9b0326 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 @@
-80legs
-Badass
-Black Hole
-Discobot
-Download Wonder
-Go-Ahead-Got-It
-mediawords
-SEOprofiler
-WebCopier
-Zermelo
+IndeedBot
+Jyxobot
+MauiBot
+Scrapy
+seoscanners
+T0PHackTeam
+WebFetch
+Web Fetch
+WWW-Mechanize
+zauba.io
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index c26aefc53..495527647 100644
--- a/.dev-tools/test_units/random-bots-for-test.list
+++ b/.dev-tools/test_units/random-bots-for-test.list
@@ -1,250 +1,250 @@
 360Spider
-404enemy
+80legs
 Abonti
-Aboundex
-Acunetix
-AfD-Verbotsverfahren
-Alligator
-AllSubmitter
-Anarchie
-Apexoo
-archive.org_bot
+AhrefsBot
+AIBOT
+Aipbot
+Alexibot
+AlphaBot
 ASPSeek
-Asterias
 Attach
-backlink-check
-BacklinkCrawler
+autoemailspider
+Backlink-Ceck
 BackStreet
-Barkrowler
+BackWeb
+BatchFTP
+Battleztar Bazinga
 BBBike
-BDCbot
-BDFetch
-Bigfoot
-Bitacle
-BlowFish
-Boardreader
+BetaBot
+Blackboard
+BlackWidow
+Blow
 Bolt
 Brandwatch
-Buddy
 BuiltBotTough
 BuiltWith
-Bullseye
 BunnySlippers
-BuzzSumo
-Calculon
-CCBot
-CheeseBot
-CheTeam
-ChinaClaw
+CATExplorador
+CherryPicker
 Claritybot
-Cliqzbot
+cognitiveseo
+com.plumanalytics
 CopyRightCheck
-Copyscape
-crawler4j
-crawl.sogou.com
-CrazyWebCrawler
+crawler.feedback
+Crescent
+CrunchBot
+CSHttp
 Curious
-DatabaseDriverMysqli
+Custo
 DBLBot
 demandbase-bot
-Deusu
+Demon
 Devil
-Digincore
-DIIbot
-Disco
-Discobot
-Discoverybot
+Dispatch
 DittoSpyder
 DomainAppender
-DomainCrawler
-DomainStatsBot
 Download Wonder
-DSearch
+Dragonfly
+Drip
+DTS Agent
 Ebingbong
 eCatch
-EMail Siphon
-EroCrawler
-Express WebPictures
+EMail Wolf
+Evil
+Extractor
+ExtractorPro
 Ezooms
 FDM
 FHscan
-FlashGet
+Firefox/7.0
+Foobot
+Freeuploader
+FyberSpider
+Fyrebot
 GermCrawler
-Getintent
-GetWeb
 Gigablast
 Gigabot
 G-i-g-a-b-o-t
+Go-Ahead-Got-It
 Gotit
-GrapeFX
+Go!Zilla
+Grafula
+GridBot
+GT::WWW
+Haansoft
 HaosouSpider
 Harvest
-HEADMasterSEO
 HMView
-Iblog
-IDBot
-IlseBot
-Image Sucker
+HybridBot
+Id-search
+IndeedBot
+Indy Library
 InfoNaviRobot
-InfoTekies
+instabid
+InterGET
 Internet Ninja
 InternetSeer
-ips-agent
-Iria
+internetVista monitor
+IRLbot
+JamesBOT
 Jbrofuzz
-Jetty
+JetCar
+JikeSpider
 JOC Web Spider
+Joomla
 Jorgee
-JustView
 Kozmosbot
-LeechFTP
-LexiBot
-LibWeb
+Larbin
 Libwhisker
+Lightspeedsystems
 Likse
-Linkdexbot
-LinkextractorPro
 LinkpadBot
-LinkScan
-LinksManager
-LinqiaRSSBot
+LinqiaMetadataDownloaderBot
 LinqiaScrapeBot
+Lipperhey
 Litemage_walker
 LNSpiderguy
 Ltx71
-lwp-request
 LWP::Simple
+lwp-trivial
 Magnet
 Mail.RU_Bot
 Majestic12
 MarkWatch
 Masscan
+Mass Downloader
+Mata Hari
 meanpathbot
 Meanpathbot
+MegaIndex.ru
 MFC_Tear_Sample
-Microsoft Data Access
-Microsoft URL Control
-MJ12bot
+MIDown tool
+MIIxpc
+Mister PiX
 Mojeek
 Morfeus Fucking Scanner
-Mr.4x3
+MSFrontPage
+Msrabot
+MS Web Services Client Protocol
 Musobot
-Name Intelligence
+Nameprotect
 Needle
-Netcraft
-netEstate NE Crawler
+NetAnts
+NetLyzer
 NetMechanic
-NetSpider
-Netvibes
-NetZIP
-NextGenSearchBot
+Net Vampire
+Nibbler
 NICErsPRO
-Nimbostratus
-oBot
-Octopus
+Nikto
+Nmap
+Nutch
+Offline Explorer
+Offline Navigator
+OnCrawl
+OpenLinkProfiler
 Openvas
-OpenVAS
-OrangeBot
-OrangeSpider
+OutclicksBot
 OutfoxBot
+PageGrabber
+page scorer
 Pandalytics
-Papa Foto
+Pavuk
+pcBrowser
+PECL::HTTP
 PeoplePal
 PHPCrawl
-Picsearch
-PictureFinder
+Picscout
 Pimonster
-Pixray
-PleaseCrawl
-Pockey
+Pi-Monster
+plumanalytics
+POE-Component-Client-HTTP
 Probethenet
-QueryN Metasearch
+Psbot
+PyCurl
+Quick-Crawler
 RankActive
-RankFlex
+RankActiveLinkBot
+RankingBot
+RankingBot2
 Rankivabot
 RankurBot
-RealDownload
-RepoMonkey
+Reaper
+RebelMouse
+ReGet
 Ripper
-SalesIntelligent
-SBIder
-Scrapy
-SearchmetricsBot
+Rogerbot
+ScoutJet
+Screaming
+SemrushBot
 SEOkicks-Robot
-SEOlyticsCrawler
-Seomoz
-SEOprofiler
-seoscanners
 SeoSiteCheckup
-SEOstats
-sexsearcher
+serpstatbot
 SISTRIX
 Sitebeam
-SiteSnagger
-Site Sucker
-SMTBot
-Snake
+Siteimprove
+SiteLockSpider
+Sitevigil
+SmartDownload
 Snapbot
-Snoopy
-SocialRankIOBot
-Sogou web spider
+Sociscraper
+sogouspider
 Sosospider
 Sottopop
-SpaceBison
+Spammen
 SpankBot
 Spinn3r
 spyfu
-Sqlmap
-Sqlworm
-Steeler
-SuperBot
-Suzuran
+Sucker
+SuperHTTP
+SurveyBot
+sysscan
+Szukacz
+T8Abot
 tAkeOut
 Teleport
 Telesoft
-Telesphoreo
-Thumbor
+Titan
+Tracemyfile
 Trendictionbot
-trendiction.de
-Turingos
-TurnitinBot
-TwengaBot
-URLy.Warning
-VCI
+trendiction.com
+Turnitin
+Typhoeus
+UnisterBot
+Upflow
+URLy Warning
+Vacuum
+VB Project
 VeriCiteCrawler
-VoidEYE
+VidibleScraper
 Voil
-WallpapersHD
-WebAuto
+WBSearchBot
+Webalta
+Web Auto
 WebBandit
-WebCopier
-WEBDAV
 WebEnhancer
-Web Enhancer
-WebFetch
-WebFuck
 Web Fuck
-WebGo IS
+WebImageCollector
 WebLeacher
-Webshag
+WebmasterWorldForumBot
+Web Pix
 WebsiteExtractor
-Webster
+WebsiteQuester
 WebStripper
 WebSucker
 Web Sucker
+WebZIP
 WeSEE
-Whacker
-WinHTTrack
-WISENutbot
+Whack
+Widow
+Woobot
+Wotbox
 Wprecon
 WPScan
 WWW-Collector-E
-WWW-Mechanize
-Xaldon WebSpider
+WWWOFFLE
+x09Mozilla
 Xenu
 YoudaoBot
-zauba.io
-Zermelo
-Zeus
+Zauba
 zgrab
 ZmEu
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 44e41e6c6..0509134ad 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
 AfD-Verbotsverfahren
 AIBOT
-AiHitBot
-Alexibot
 Alligator
-AllSubmitter
 AlphaBot
 Anarchie
 ASPSeek
 Asterias
 Attach
-BackStreet
-BackWeb
+autoemailspider
+Backlink-Ceck
+backlink-check
+Badass
 Barkrowler
-BetaBot
+Battleztar Bazinga
+BDCbot
+BDFetch
 Bitacle
-Blackboard
-Black Hole
-BlackWidow
 Blow
 BlowFish
-Boardreader
-Bolt
-Brandprotect
-Buddy
+BuiltBotTough
 BuiltWith
 BunnySlippers
-Calculon
-CATExplorador
 CazoodleBot
-Cegbfeieh
+CCBot
 Claritybot
 Cliqzbot
 Cogentbot
-cognitiveseo
+Copier
 CopyRightCheck
 Cosmos
-crawler4j
-CrazyWebCrawler
+crawler.feedback
+Crescent
 CrunchBot
 CSHttp
 Curious
-Custo
-DatabaseDriverMysqli
 DataCha0s
-DBLBot
-DIIbot
-Discobot
-Discoverybot
-Dispatch
+Demon
+Deusu
+Dirbuster
+DomainAppender
 DomainCrawler
-DTS Agent
-EasyDL
 Ebingbong
 eCatch
 EirGrabber
+EMail Wolf
 EroCrawler
-evc-batch
 Exabot
 Express WebPictures
-ExtLinksBot
-Extractor
-ExtractorPro
 EyeNetIE
-facebookscraper
+Ezooms
 FDM
 FHscan
-Flunky
-FyberSpider
-GalaxyBot
+Freeuploader
 Genieo
-Gotit
-GoZilla
+GermCrawler
+Gigabot
+Grabber
 GrabNet
+Grafula
 GrapeFX
-GrapeshotCrawler
 GT::WWW
-HaosouSpider
+Haansoft
 Harvest
-Havij
-Iblog
-IDBot
-Id-search
-Image Sucker
-IndeedBot
+Heritrix
+HMView
+HTTP::Lite
+Humanlinks
+IlseBot
+Image Fetch
 Indy Library
-InfoNaviRobot
-instabid
+InfoTekies
 Intelliseek
-Iria
-IRLbot
+InterGET
+Internet Ninja
+InternetSeer
+internetVista monitor
+ips-agent
 Iskanie
 IstellaBot
-JamesBOT
 JetCar
-Jetty
 JOC Web Spider
-Joomla
-Jyxobot
-Kenjin Spider
-Keyword Density
+JustView
 Kozmosbot
-LexiBot
+LeechFTP
 Lftp
 Lightspeedsystems
-Likse
+Linkdexbot
 LinkextractorPro
-LinkpadBot
 LinkScan
-LinksManager
-LinqiaScrapeBot
+LinkWalker
+LinqiaMetadataDownloaderBot
+LinqiaRSSBot
 Lipperhey
 Lipperhey Spider
 Lmspider
+LNSpiderguy
 Ltx71
+lwp-request
+LWP::Simple
 Mag-Net
 magpie-crawler
 Majestic12
-Majestic-SEO
-MarkMonitor
+Majestic SEO
 MarkWatch
 Masscan
-meanpathbot
+MauiBot
 Meanpathbot
-MJ12bot
-Morfeus Fucking Scanner
+Mediatoolkitbot
+MegaIndex.ru
+Metauri
+Microsoft Data Access
+Microsoft URL Control
+Mojeek
+Mr.4x3
+MSIECrawler
+Msrabot
 MS Web Services Client Protocol
-muhstik-scan
 Musobot
-Nameprotect
+Name Intelligence
 Navroad
 NearSite
+Needle
 Nessus
-NetAnts
-NetSpider
+netEstate NE Crawler
+NetLyzer
+Nettrack
 Netvibes
-Niki-bot
+Nibbler
+Nikto
+Nimbostratus
+Nmap
 NPbot
-oBot
+Nutch
+Offline Explorer
+Offline Navigator
+OnCrawl
+OpenLinkProfiler
 Openvas
 OpenVAS
-Page Analyzer
-PageGrabber
-Papa Foto
-pcBrowser
-PECL::HTTP
+OrangeBot
+PageAnalyzer
+PeoplePal
 Picscout
+Picsearch
+Pimonster
 Pixray
-PleaseCrawl
 POE-Component-Client-HTTP
 Probethenet
+ProPowerBot
 Psbot
-QueryN Metasearch
+PyCurl
+Quick-Crawler
 RankActive
+RankActiveLinkBot
+RankFlex
+RankingBot
 RankingBot2
 Rankivabot
-RankurBot
 RealDownload
+Reaper
 RebelMouse
+RedesScrapy
+RepoMonkey
 Ripper
-SBIder
-Scanbot
-ScoutJet
-Screaming
-Semrush
-SEOkicks
-SEOlyticsCrawler
-Seomoz
-SEOprofiler
+Rogerbot
+SalesIntelligent
+ScanAlert
+scan.lol
 seoscanners
 SeoSiteCheckup
-serpstatbot
+sexsearcher
+Shodan
+Siphon
+Siteimprove
 SiteSnagger
+Sitevigil
 SlySearch
-Snake
 Snapbot
-Snoopy
+sogouspider
 Sosospider
-Sottopop
-Spammen
+SpaceBison
 Spanner
-sp_auditbot
+SputnikBot
 Sqlmap
-Sqlworm
 Sqworm
+Steeler
 Stripper
-Sucker
+Sucuri
 SuperBot
-Swiftbot
-T0PHackTeam
-T8Abot
-The Intraformant
+SuperHTTP
+tAkeOut
+Teleport
+TeleportPro
+Telesoft
+Telesphorep
 TheNomad
-TightTwatBot
+Thumbor
 Titan
-Tracemyfile
-Trendictionbot
 trendiction.de
-Turingos
-TurnitinBot
-TwengaBot
+True_Robot
 Twice
-UnisterBot
 Upflow
 URLy Warning
-URLy.Warning
+Vacuum
 Vagabondo
 VB Project
-Virusdie
+VeriCiteCrawler
+VidibleScraper
+VoidEYE
+Voil
+Voltron
 Wallpapers/3.0
 WBSearchBot
-Web Collage
-WebEnhancer
-WebFetch
-Web Fetch
+Webalta
+WebAuto
+WebCopier
 WebFuck
-WebPix
+WebGo IS
+WebImageCollector
+WebLeacher
+Web Pix
 WebReaper
-Web Sauger
-Website Quester
+WebSauger
+Webshag
 Webster
-WebStripper
-Web Sucker
 WebWhacker
-Whack
-Whacker
+WebZIP
 Whatweb
 Who.is Bot
 Widow
-WinHTTrack
 WiseGuys Robot
 WISENutbot
-Wonderbot
 Wotbox
-Wprecon
-WPScan
-WWW-Mechanize
-WWW::Mechanize
-Xaldon WebSpider
+WWW-Collector-E
+WWWOFFLE
+x09Mozilla
+x22Mozilla
 Xaldon_WebSpider
+Xenu
 YoudaoBot
 Zermelo
+Zeus
 ZmEu
 ZumBot
+ZyBorg
diff --git a/.dev-tools/test_units/random-referrers-for-test-quick.list b/.dev-tools/test_units/random-referrers-for-test-quick.list
index 56200b7f6..aa0314547 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 @@
-excitacion.info
-mydirtystuff.com
-porno-play.net
-proekt-mos.ru
-saddiechoua.com
-soserfis.com
-star61.de
-theendivechronicles.com
-timdreby.com
-xwatt.ru
+000free.us
+cntravelre.com
+e705.net
+eladkarako.com
+kurwa.win
+marcogrup.com
+siteripz.net
+strongsignal-a.akamaihd.net
+toondinsey.com
+wnhjavlhezp.gq
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index e1b8a6ecf..aead3431a 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 @@
-007angels.com
-0912701309f8ce.com
-0c47f8422d3f.com
-1kdailyprofit.me
-202ch.com
-2ads.co.uk
-3-letter-domains.net
-4webmasters.org
-8kisses.eu
-aa625d84f1587749c1ab011d6f269f7d64.com
-aad1f4acb0a373420d9b0c4202d38d94fa.com
-adclickservice.com
-addray.pro
-adexprts.com
-adsfresh.men
-adultnet.in
-adult-shop.com.ua
-advertisingtag.net
+000free.us
+123any.com
+123locker.com
+1flag.co.za
+2pxg8bcf.top
+3weekdiet.com
+4ur.click
+5i2.net
+72-news.com
+7yue.org
+8si.ru
+a14download.com
+aa08daf7e13b6345e09e92f771507fa5f4.com
+aa14ab57a3339c4064bd9ae6fad7495b5f.com
+aanapa.ru
+aarbur.com
+abcdefh.xyz
+adclickthru.net
+adhome.biz
+adloads.com
+adprotect.net
+ads-cool.pro
+adtech.de
+adtology.com
 afftrack001.com
-all4invest.ru
-allpdfmags.net
-alot.com
-amung.us
-anal-acrobats.com
-animal-drawings.com
-apartment.ru
-approved.su
-arendas.net
-asophoto.com
-atelielembrancaqueencanta.com.br
-atmagroup.ru
-autochoixspinelli.com
-autoloans.com
-autoseo-traffic.com
-avon-novosib.ru
-azartclub.org
-baladur.ru
-bannerspace.com
-bear.gotcher.us
+afmuseum.com
+afslankpillen2017nl.eu
+agecheckadult.com
+air-edem.ru
+akita.kz
+akvamaster.dp.ua
+alfabot.xyz
+alif-ba-ta.com
+allproblog.com
+all-streaming-media.com
+alltheviews.com
+allwidewallpapers.com
+anaksma.info
+animaltoplist.com
+anime.dougasouko.com
+anlimebel.kiev.ua
+antons-transporte.de
+apartmentratings.com
+apisecretsaucebi-a.akamaihd.net
+apple.com-webbrowsing-security.science
+applicationg29.com
+arcadeplayhouse.com
+arendatora.ru
+arraty.altervista.org
+articlesdirectoryme.info
+arvut.org
+astana.xxxkaz.org
+audiofree.ru
+australia-opening-times.com
+auto-zapchasti.org
+availit.weebly.com
+avek.ru
+aviav.eu
+azbuka-mo.ru
+baksman.com
+balook.com
+bamo.xsl.pt
+banksrf.ru
+bank.uz
+bausparen.bz.it
 beauty-bracelet.com
-beauty-clinic.ru
-becuo.com
-begalka.xyz
+beremenyashka.com
 best-games.today
-bestserials.com
-bio-market.kz
-blogos.kz
+bet365.com
+beyan.host.sk
+bezlimitko.xyz
+bibys.com
+bidbuy.co.kr
+big-cash.net
+bitcoinremote.com
+bitcoins-live.ru
+bloglag.com
 blogqpot.com
-blogrankers.com
-bochemit.com.ua
-boc.kz
-boleznikogi.com
-bongiornos.info
-braip.com.br
+bmsco.co
+bombla.org
+bonkers.name
+bonzbuddy.com
+brandbucket.com
+brandov.ru
+brateg.xyz
+builtwith.com
+bumble.cheapwebsitehoster.com
+bumskontakte.org
 buntube.net
-business-made-fun.com
-buyessay3.blogspot.ru
-buyessaynow.biz
-buyessayonline19.blogspot.ru
-bwlx.prepedu.cn
-bycontext.com
-cam-kontakte.org
-carloans.com
-cartechnic.ru
-cartujano-pre.de
-c-english.ru
-chelnytruck.ru
+buypanicdisorderpill.com
+buypuppies.ca
+cablecar.us
+candypeople.se
+casinos4dummies.co.uk
+cbcseward.com
+cdncash.com
+cheap-trusted-backlinks.com
+checkm8.com
+chinajerseyswholesalecoupons.com
 chocolateslim-u-srbiji.com
-christianlouboutinsaleonline.us
-cicaki.net
-cindymatches.com
-citysecurity.nu
-civilwartheater.com
-clarithromycin500mg.com
-clickaider.com
-clickzzs.nl
-collegerentals.com
-compliance-barak.top
+christianlouboutinreplica.pw
+cialis-samples.com
+cinemaenergy-hd.ru
+cjmc.info
+classiquebijoux.ru
+clickhype.com
+clips.ua.ac.be
+clmforexeu.com
+comeondog.info
+compiko.info
 compliance-checker.info
-compliance-elena.xyz
-compliance-fred.xyz
-compliance-jack.top
-conocer-sanabria.com
-counter.bloke.com
-country-chic.ru
-covadhosting.biz
-crackzplanet.com
-creatives.adbetclickin.pink
-crystalslot.com
-cyprusbuyproperties.com
-dailyfinancefix.com
-damasarenai.info
-dame-ns.kz
-ddsoldes.fr
-deanmoore.ie
+computernetworksonline.com
+cool-wedding.net
+copenergo.ru
+copro.pw
+countercrazy.com
+crafthubs.com
+creditwell.ru
+cubook.supernew.org
+customerguru.in
+cvety24.by
+daisye.top
+danashop.ru
+darmebel.com.ua
+dbmkfhqk.bloger.index.hr
+ddlmega.net
+dealighted.com
+dellalimov.com
 deluxedumps.com
-demian.kz
-deniven.1bb.ru
-dentalpearls.com.au
-design-ideas.info
-detskie-konstruktory.ru
-deutschehobbyhuren.net
-dfiles.me
-dgfitness.co
-dignitasdata.se
-divku.ru
-doctormakarova.ru
-doktoronline.no
-doublepimp.com
-drunkmoms.net
-dstroy.su
-earl-brown.info
-editors.choice6912650.hulfingtonpost.com
-edudocs.net
-ee77ee.com
+dev.citetick.com
+directivepub.com
+dirtpics.pw
+djekxa.ru
+dktr.ru
+dkvorota.ru
+dmmspy.com
+documentbase.net
+domainsatcost.com
+dostavimvdom.ru
+doxysexy.com
+drillsaw.ru
+druzhbany.ru
+e705.net
+earncash.com.ua
+educatemetv.com
+eduserver.net
 ege-russian.ru
+election.interferencer.ru
 electricwheelchairsarea.com
-elektronischezigarettekaufen1.myblog.de
-elektrozigaretten1.webs.com
-el-nation.com
-emerson-rus.ru
-englishdictionaryfree.com
-englishgamer.com
-enternet.ee
-erectile.bid
-esopini.com
-estibot.com
-europeanwatches.ru
-excaliburfilms.com
-excitacao.com
-extstat.com
-ezigaretteshop2.mywapblog.com
-f012.de
+electrik-avenue.com
+elektronischezigarettekaufen1.beeplog.com
+elektrozigarette1.dreamwidth.org
+elektrozigaretten2.yn.lt
+eng-lyrics.com
+eropho.com
+escortslet.net
+eu-cookie-law.info
+everflora.ru
+exct.net
+expertblog.info
+extractorandburner.com
+ezigarettenkaufen1.deviantart.com
+ezigaretteshop2.vefblog.net
 fanrto.com
-fealq.com
-financepoints.eu
+farmingworm.com
+fashion-stickers.ru
+fearcrow.com
+fetlifeblog.com
+filmci.pro
+find1friend.com
 findanysex.com
-finteks.ru
-flavors.me
-free-fbook-traffic.com
-freenom.link
-freewlan.info
-fr.netlog.com
-fz139.ttk.ru
-gabeshop.ru
-galaxyflowers.ru
-galleryawesome.com
-gamblingnerd.com
-gamedayassist.com
-gateway.zscalertwo.net
-genericlowlatencyasiodriverhq.aircus.com
-getresponse.com
-getyourimage.club
-gigablast.com
-gigapeta.com
-glastecfilms.com.my
-glavprofit.ru
-goatse.ru
-golmau.host.sk
-gopro-online.info
-gorodservis.ru
-gotcher.us
-gpms.org.my
-greatfind-a.akamaihd.net
-gsou.cf
-gtopstats.com
-guigyverpo.cf
-gungamesz.com
-gwagka.com
-handicapvantoday.com
-hannasolution.ru
-hasshe.com
-hatedriveapart.com
-hausfrauensex18.com
+findthe.pet
+fiuxy.com
+flash4fun.com
+flauntyoursite.com
+floridamhca.org
+florida-tourism.net
+flowersbazar.com
+free-gluten.ru
+freewebs.com
+frustrated-favorable.gq
+fsakhalin.ru
+gamedayhouse.com
+gameprimary.com
+gaytube.com
+geilehausfrauen.net
+geile-lelly.eu
+generousdeal-a.akamaihd.net
+germetiki.com.ua
+getridofstretchmarks.org
+ghazel.ru
+gilbertbanda.net
+gk-atlant.info
+gok-kasten.net
+gopixdatabase.com
+graphid.com
+grizzlysgrill.com
+gsbs.com.ua
+guardlink.com
+guarrasdelporno.xxx
+gwebtools.com.br
+gwhwpxbw.bloger.index.hr
+hackers-crackers.tk
+hamacapty.com
+handicapbathtubarea.com
+hanwei.us
+haveinc.xyz
 hchha.com
-hdfreeporno.net
-headpress.ru
-helpmymacfaster.trade
-hidefiles.org
-hitsbox.info
-hledejvshopech.cz
-hobild.net
-homeandhealth.ru
-hoverboard360.de
-hoverboard360.se
+hentai-manga.porn
+hermesbirkinhandbagoutlets.com
+hikesearch.net
+hmywwogw.bloger.index.hr
+homemade.gq
 hunterboots.online
-idegenvezeto.eu
+hystersister.com
+ideibiznesa2015.ru
+ideoworld.org
 ie.57883.net
-ifmo.ru
-igtools.club
-ilte.info
-imagefinder.site
-imgarit.pw
-img.wallpaperstock.net
-imperiafilm.ru
-impisr.edunsk.ru
-importchinacoach-teach.com
+iflycapetown.co.za
+i-hobot.ru
+ilmexico.com
 incomekey.net
-indiasourcemart.in
-infoupdate.org
-intellekt21.ru
-investsuccess.org
-iqoption.com
-iqupdatetmz.win
-islamtoday.co.za
-ivearchenceinflu.cf
-izhevsk.zrus.org
-jbl-charge.info
+infazavr.ru
+infokonkurs.ru
+interior-stickers.ru
+iplogger.org
+iqoption.pro
+istripper.com
+itag.pw
+itronics.ca
+javspace.net
 jerseyssportsshop.com
-johnrobertsoninc.com
-karusel-market.ru
-kevblog.top
-kichenaid.ru
-kinoduh.ru
-kiwi237au.tk
-kndxbkdx.bloger.index.hr
-konica.kz
-kountrylife.com
-kredit-blog.ru
-kredit-pod-zalog-krasnodar.ru
-kretpicf.pw
-krynica.info
-lancheck.net
-larger.io
-leadn.pl
-leftofcentrist.com
+jikoman.info
+kadashihotel.com
+kashubadesign.ru
+kinotorka.ru
+klejonka.info
+koleso24.com.ua
+koptims.tiu.ru
+kosova.de
+koversite.info
+krafte.ru
+krassh.ru
+krasula.pp.ua
+kutikomi.net
+labvis.host.sk
+lampokrat.ws
+landoftracking.com
+larose.jb2c.me
+lasvegaslockandsafe.com
+lazy-z.com
 lego4x4.ru
-letmacwork.world
-lifeinsurancekb.com
-light.ifmo.ru
-liky.co.ua
-limads.men
-linkbuddies.com
+lennatin.info
+letslowbefast.site
+li-er.ru
+linkbux.ru
 linkwithin.com
-lion.misba.us
-lirunet.ru
-liumimgx.pw
-livefixer.com
-liveinternet.ru
-livejasmin.com
-liverpool.gsofootball.com
-lmrauction.com
-localmatchbook.com
-locksmith.jp
-lombia.com
-longlifelomilomi.info
-lotto6888.com
-luckyshop.net.ua
-m1media.net
-mackeeper-center.club
-macrotek.ru
-magicalfind-a.akamaihd.net
-maglid.ru
-mailemedicinals.com
-malwareremovalcenter.com
-mathgym.com.au
-m.b00kmarks.com
-meccadumps.net
-megahdporno.net
-meltwater.com
-menetie.ru
-mexicotravelnet.com
+lion.bolegapakistan.com
+livingroomdecor.info
+loginduepunti.it
+lolnex.us
+lookingglassemb.com
+lottospring.com
+mactechinfo.info
+mahnwachen-helfen.info
+mararoom.ru
+marketingtechniques.info
+matrixalchemy.com
+maximpartnerspr.com
+max-p.men
+mearns-tractors.co.uk
+meble-bogart.info
+medicinacom.ru
+mezaruk.info
+micasainvest.com
+middlerush-a.akamaihd.net
+miniature.io
+minyetki.ru
 mir-betting.ru
-mir-business-24.ru
-mirobuvi.com.ua
-mirtorrent.net
-mirzonru.net
-missvietnam.org
-mistr-x.org
-mobile-appster.ru
-mobilemedia.md
-mobsfun.net
-moje-recenze.cz
-monclerboots.xyz
-moneyteam24.com
-morf.snn.gr
-morocco-nomad-excursions.com
+misswell.net
+money-for-placing-articles.com
 moscow.xrus.org
+mosdverka.ru
 mrbitsandbytes.com
-mriyadh.com
-musicas.baixar-musicas-gratis.com
-musicdaddy.net
+musezone.su
+music.utrolive.ru
 my-big-family.com
-myiptest.com
-myseoconsultant.com
-myxdate.info
-naphukete.ru
-nardulan.com
-narosty.com
+my-floor.in.ua
+myhydros.org
+myonigroup.com
+namenectar.com
+natali-forex.com
 naval.jislaaik.com
-new-apps.ru
-nextlnk12.com
-nfljerseysforsalewholesaler.com
-no-fuel.org
-nottyu.xyz
-novosibirsk.xrus.org
-oktube.ru
-omoikiri-japan.ru
-online-x.ru
-onlyforemont.ru
-o-o-8-o-o.com
-openlibrary.org
-osb.se11.ru
-ozoz.it
-panchro.xyz
-parfusale.se
-partner-cdn.men
-patol01.pw
-pdns.download
-perm.xrus.org
-pipki.r.acdnpro.com
+net-profits.xyz
+nfvsz.com
+nicefloor.co.uk
+nicovideo.jp
+nl.netlog.com
+northfacestore.online
+notasprensa.info
+oakridgemo.com
+offer.camp
+oil-td.ru
+orion-code-access.net
+ostrovtaxi.ru
+otbelivanie-zubov.com
+outrageousdeal-a.akamaihd.net
+ozas.net
+pandroid.co
+parajumpersstore.online
+paramountmarble.co.uk
+partner-host.men
+partners-ship.pro
+pateaswing.com
+pawli.eu
+paydayonlinecom.com
+pdns.cz
+pensplan.com
+pestomou.info
+petrovka-online.com
+pewit.pw
+piski.top
+piter.xrus.org
 pl.aasoldes.fr
-pliks.pl
-ploenjitmedia.azurewebsites.net
-plohaya-kreditnaya-istoriya.ru
 pochtovyi-index.ru
-polcin.de
-popcash.net
-poppen-nw.net
-poquoson.org
-pornhubforum.tk
-pornofiljmi.com
-pornosee.info
-pornosexrolik.com
-porno-transsexuals.ru
-pravoholding.ru
-predominant-invent.tk
-pricheskaonline.ru
-privatov-zapisi.ru
-privhosting.com
-prizestohandle.club
-produkto.net
-prodvigator.ua
-pronorm.fr
-pron.pro
-pro-okis.ru
-pro-poly.ru
-prostitutki-belgoroda.org
-prostitutki-kiev.org
-quickcashlimited.com
-radiogambling.com
-ranksonic.org
-realizmobi.com
-real-time-analytics.com
+podshipniki-ntn.ru
+pontiacsolstice.info
+porndl.org
+pornoklad.net
+pornoreino.com
+portnoff.od.ua
+posible.net
+powc.r.ca.d.sendibm2.com
+predmety.in.ua
+pricheski-video.com
+printingpeach.com
+privatefx.all4invest.info
+profolan.pl
+prostitutki-almata.org
+prostitutki-tolyatti.org
+prpops.com
+psvita.ru
+rabot.host.sk
+rankexperience.com
+raschtextil.com.ua
+razamicroelectronics.com
+realnye-otzyvy.info
 registrationdomainsite.com
 registrydomainservices.com
-reining.lovasszovetseg.hu
-rentaremotecomputer.com
+relax.ru
+remorcicomerciale.ro
+renecaovilla.online
 replicalouboutin.xyz
-replica-watch.ru
-reyel1985.webnode.fr
-rockingclicks.com
-roofers.org.uk
-ros-ctm.ru
-royalcar-ufa.ru
-royal-investments.net
-ru-dety.ru
-ruex.org.ua
-running-line.ru
-rusenvironmental.net
-rutor.group
-sack.net
-safe-app.net
-saletool.ru
-saratov.xrus.org
-saugatuck.com
+reward-survey.net
+ricorsogiustizia.org
+rogervivierforsale.com
+rootandroid.org
+royalvegascasino.com
+russintv.fr
+russkie-gorki.ru
+rvtv.ru
+saitevpatorii.com
+sarm.tk
 savetubevideo.com
-sbricur.com
-sbwealthsolutions.ca
-scanner-jessica.top
-scanner-john.top
-scoopquest.com
-sc-specialhost.com
-sdi-pme.com
-searchimage.co
+scanner-brian.top
+scanner-elena.top
+scenicmissouri.us
+sdrescher.net
+seansonline24.pl
+searchengineranker.email
 searchinquire.com
-search.pch.com
+seasaltwithfood.com
 seeingmeerkat.com
-segol.tv
-seksotur.ru
-seoholding.com
-seoprofiler.com
-serptehnika.ru
-sexy-pings.com
-sfj-ror.no
-silktide.com
-simpoed.ufop.br
+sel-hoz.com
+semalt.com
+sendearnings.com
+seoheap.com
+seolab.top
+seorank.info
+seotoolsagency.com
+serdcenebolit.com
+sexcamamateurchat.com
+sex-dating.co
+sextracker.com
+sextracker.de
+sexyteens.hol.es
+shikiso.info
+shisha-swag.de
+shohanb.com
+shopvilleroyboch.com.ua
 skatestick.bid
-skytraf.xyz
-sledstvie-veli.net
-smart-scripts.com
-snomer1.ru
-socialbutton.xyz
-souvenirua.com
-space4updating.win
-spasswelt.xyz
-splendorsearch-a.akamaihd.net
-spravka130.ru
-stal-rulon.ru
-starpages.net
-steelmaster.lv
-strongholdsb.ru
-sudexpert66.ru
-susanholtphotography.com
-swinon.site
-taaaak.com
-taraz.xkaz.org
-taxi-v-eisk.ru
-tecspb.ru
-telefonsexkostenlos.tk
-tengohydar.tk
-thecounter.com
-thegameriders.com
-tiens2010.ru
+skladvaz.ru
+slowmacfaster.trade
+smartpet.ru
+snsdeainavi.info
+socialseet.ru
+social-s-hhh.xyz
+sockshare.net
+specialfinanceoffers.com
+special-porn.com
+sptslmtrafms.com
+srdrvp.com
+sstroy44.ru
+stanthonyscatholicchurch.org
+stpolice.com
+strana-solnca.ru
+sundrugstore.com
+superstarfloraluk.com
+suture.co
+svarkagid.com
+symphonyintegratedhealthcare.com
+takeflyte.com
+tattomedia.com
+teesdaleflyballclub.co.uk
+telesvoboda.ru
+telsis.com
+thebluffs.com
+tilido.com
 timhost.ru
-tizanidinedrugtest.blogspot.com
-tizanidinehcl2mgtablet.blogspot.com
-tizanidinehcl4mgisitanarcotic.blogspot.com
-tizanidinehclsideeffects.blogspot.com
-tizanidinevscyclobenzaprine.blogspot.com
-tmm-kurs.ru
-token-lab.org
-toloka.hurtom.com
+tizanidineandcipro.blogspot.com
+tizanidineforopiatewithdrawal.blogspot.com
+tizanidineinteractions.blogspot.com
+tmtrck.com
+tomatis.gospartner.com
+toolsky.com
 topclickguru.com
-track112.site
-trafficjunky.com
-tripper.de
-trkur.com
-trustaffs.com
+top-deal.com.pl
+topsy.com
+trackmedia101.com
+trafficmania.com
+traffique.net
+trkdf.com
 trustedhealthtips.com
-tt-ipd.info
-ttsq.fr
-tubeoffline.com
-tubo360.com
-tuckermktg.com
-twojebook.pl
-typimga.pw
-uginekologa.com
-uhdtv.website
-ultramart.biz
-um-razum.ru
-unblocksit.es
-unmaroll.ya.ru
-unrealcommander.org
-urlcut.ru
-uroki.net
-v720hd.ru
-vabasa.inwtrade.com
-vadimkravtcov.ru
-valoresito.com
-vegascosmetics.ru
-vereo.eu
-videochat.life
-vintontech.info
-vip-file.com
-vipsiterip.org
-vitanail.ru
-vladimir.zrus.org
-vltai.com
-vonradio.com
-voprosotvet24.ru
+tuckpointingmasonrysystems.com
+tula.mdverey.ru
+tvoystartup.ru
+udayavani.com
+umaseh.com
+umekana.ru
+unacittaconte.org
+urldelivery.com
+usacasino.com
+us-america.ru
+ussearche.cf
+valkiria-tk.ru
+v-doc.co
+velobikestock.com
+venerologiya.com
+veselokloun.ru
+vgoloveboli.net
+video-chat.in
+video-hollywood.ru
+video-production.com
+vikistars.com
+vinsit.ru
+vipromoffers.com
+vod.com.ua
+voloo.ru
 vostoktrade.info
-vozbujdenie.com
-vremya.eu
-wallpaperstock.net
-watchdogs-2.ru
-waysbetter.cn
-webalan.ru
-webmasters.stackexchange.com
-wechatdownload10.com
-weclipart.com
-wetgames.ru
-wholesalejerseychinaoutlet.com
-wholesalenfljerseys.us.com
-winx-play.ru
-wma-x.com
-wnoz.de
-womensterritory.ru
-woodyguthrie.se
-wowcasinoonline.ooo
-writingservices17.blogspot.ru
-xchat26.myfreecams.com
-xn----7sbahjd3btneuw1joc.xn--p1ai
-xn--80abgj3a5acid6ghs.top
-xn--e1afanlbnfckd7c3d.xn--p1ai
-xn--l1aengat.xn--p1ai
-xolodremont.ru
-xportvusbdriver8i.snack.ws
-xtremeeagles.net
-xwatt.ru
-xxart.ru
-youtoner.it
-youtuhe.com
-yugo-star.ru
-zakon-ob-obrazovanii.ru
-zeroredirect6.com
-zhorapankratov7.blogspot.com
-znakom.sibtest.ru
-zoompegs.com
-zrizvtrnpale.tk
+vsdshnik.com
+wallpapersdesk.info
+wallpapersist.com
+wareseeker.com
+warezkeeper.com
+webmonetizer.net
+websites-reviews.com
+websitevaluebot.com
+westsextube.com
+whipme.yopoint.in
+wildnatureimages.com
+w-journal.ru
+wnhjavlhezp.gq
+wstroika.ru
+wurr.voila.net
+www.timer4web.com
+xaylapdiendanang.com
+xcombear.ru
+x-diesel.com
+x-diesel.info
+xfluro.com
+xn--1-8sbcpb0bdm8k6a.xn--p1ai
+xn----8sbarihbihxpxqgaf0g1e.xn--80adxhks
+xn----ctbigni3aj4h.xn--p1ai
+xtrafficplus.com
+xxx-cam.webcam
+xxxkaz.org
+yaaknaa.info
+yougame.biz
+youporn-forum.ga
+yourothersite.com
+yunque.pluto.ro
+zakazfutbolki.com
+zakonobosago.ru
+zigarettenonl.canalblog.com
+zlatnajesen.com
+zoosexart.com
+zootoplist.com
+zs2vm.top
+zynax.ua
+zzbroya.com.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 de1e093de..a365fa790 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 @@
-1-99seo.com
-1stat.ru
-5tey7463.weebly.com
-6hopping.com
-aad1f4acb0a373420d9b0c4202d38d94fa.com
-advancedmassagebysara.com
-afora.ru
-alert-jdh.xyz
-altamayoztourism.com
-amanda-porn.ga
-amazingpic.net
-anapa-inns.ru
-animalrank.com
+12bet.com
+12u.info
+4ureyesonly.com
+5000-cotydzien.com
+aac500b7a15b2646968f6bd8c6305869d7.com
+accessoires-mode.in
+acunetix-referrer.com
+adclickthru.net
+adobereader-free.ru
+adserver-e7.com
+adultfullhd.com
+agroeconom.kz
+aibolita.com
+albumsuper.info
+alldezservice.kz
+alphavisions.net
+android-systems.ru
 aosheng-tech.com
+apparel-offer.com
+arewater.com
 arvut.org
-automatic-seo.com
-auto-zapchasti.org
-aviav.eu
-axbocz.net
-barnfurnituremart.com
-bayareaaeroclub.org
-beetpics.pw
-benchmarkcommunications.co.uk
-bidr.trellian.com
-big-cash.net
-bluejays-jerseys.us
-bobba.dzaba.com
-bonanza-fortune.men
-bosefux.esy.es
-btnativenav.com
+avkzarabotok.com
+avtochehli.by
+back.dog
+bangla-chat-uk-paralud.ga
+battleforupdating.site
+bausparen.bz.it
+bedcapdealers.com
+betonka.pro
+bidbuy.co.kr
+billiard-classic.com.ua
+bio-optomarket.ru
+bitcoinpile.com
+bocoarchives.org
+boleznikogi.com
+bongacams.com
+bravegirlsclub.com
+bumble.cheapwebsitehoster.com
+cactussoft.biz
+callmd5map.com
+calstaterealty.us
 candlewooddentalcentre.com.au
-capture-room.com
-cartierloveringreplica.xyz
-cdnnetwok.xyz
-chatroulette.world
-cheap-trusted-backlinks.com
-chelyabinsk.xrus.org
-chocolateslim-en-france.com
-ciceros.co
-clickprotects.com
-clipartnew.com
-cl.s7.exct.net
-collegeessay19.blogspot.ru
-com-cleaner.systems
-com-onlinesupport.host
-compiko.info
-compliance-donald.xyz
-continent-e.tv
-countbertwistdisp26.soup.io
-creditwell.ru
-crystalslot.com
-dangphoto.trade
-db.speedup.gdn
-deanmoore.ie
-decorazilla.com
-detsky-nabytek.info
-deutschehobbyhuren.net
-devochki.top
-dieswaene.com
-digitalassetmanagement.site
-discovertreasure-a.akamaihd.net
-discovertreasurenow.com
-disruptingdinnerparties.com
-doctormakarova.ru
-domaineaneblanc.com
-dotmass.top
-earthmagic.info
-econom.co
-eduserver.net
-egovaleo.it
-eleimgo.pw
-encodable.com
-enginebay.ru
-exportshop.us
-extlinks.com
-faptitans.com
-farmingworm.com
-fellowshipoftheminds.com
-femmesdenudees.com
-fermersovet.ru
-ferretsoft.com
-forex21.ru
-forex.osobye.ru
-forminecrafters.ru
-futbolkisales.ru
-gay-file.com
-getdot.ru
-getlaid-xxxhookupdirect.com
-gigapeta.com
-gotwebsite1.com
-growmyfunds.ca
-guarrasdelporno.xxx
-haikuware.com
-hop.clickbank.net
-hotblog.top
-hotchatdate.com
-howtowhitenteethfast.xyz
-hyhj.info
-ido3.com
-i-midias.net.br
+carina-sy.de
+cartierreplica.xyz
+cartierwatch.xyz
+cellfun.mobi
+cheapwebsitehoster.com
+cherrypointplace.ca
+chinajerseyswholesalecoupons.com
+choosecuisine.com
+classiquebijoux.ru
+colobit.biz
+compliance-mary.top
+compliance-viktor.top
+consorzioilmosaico.org
+constantaservice.net
+coolbar.pro
+creams.makeforum.eu
+creditnation.ru
+daneshetabiat.com
+dawlenie.com
+dev-seo.blog
+divatraffic.com
+dollartree.info
+dominterior.org
+donvito.unas.cz
+drunkenstepfather.com
+dtnlyss.com
+eas-seo.com
+e-collantes.com
+editmedios.com
+education-cz.ru
+ee77ee.com
+ekspresihati.info
+eloxal.ru
+elvenar.com
+energydiet-info.ru
+enge-fotzen.info
+enthuse.computernetworksonline.com
+erot.co
+eshop4u.jp
+eshop.md
+esopini.com
+etenininrade.ga
+extrabot.com
+ezb.elvenmachine.com
+familyholiday.ml
+fanoboi.com
+fashion-mk.net
+fefo.gdn
+f-loaded.de
+foxydeal.com
+frbizlist.com
+freemaintenancesysforpcandmac.top
+free-traffic.xyz
+gardene.ru
+gentamicineyedrops.blogspot.com
+glavtral.ru
+gloverid.site
+golaya.pw
+gotcher.us
+gsbs.com.ua
+guiadeserraazul.com
+handicapbathtubarea.com
+happy.new.yeartwit.com
+hebr.myddns-flir.com
+heliko.no
+hermesreplica.win
+heygidday.biz
+homedo.fabpage.com
+housemilan.ru
+huhn.altervista.org
+images-graphics-pics.com
 imperia31.ru
-infokonkurs.ru
-interior-stickers.ru
-internetartfair.com
-ispaniya-costa-blanca.ru
-jav-fetish.com
-jbl-charge.info
-jerseywholesalechinabiz.com
-jewelryandfiligree.com
-kinocccp.net
-kiwi237au.tk
-kollekcioner.ru
-kosynka-games.ru
-kretpicf.pw
-kupit-adenu.ru
-kwzf.net
-laudit.ru
-ledis.top
-letmacwork.world
-li-er.ru
-linkbuddies.com
-liquimondo.com
-locatellicorretor.com.br
-lomza.info
-lyngdalhudterapi.no
-magazin-pics.ru
-mail.allnews24.in
-map028.com
-mediawhirl.net
-metaxalonevstizanidine.blogspot.com
-michaelkorssaleoutletonline.net
-mir-business-24.ru
-mncrftpcs.com
-mnogolok.info
-mowser.com
-musicas.baixar-musicas-gratis.com
-myperiod.club
-nacap.ru
-offtime.ru
-onlinadverts.com
-osagonline.ru
-ossmalta.com
-owohho.com
-pattersonsweb.com
-paydayonlinecom.com
-perm-profnastil.ru
-photosaga.info
-pictures-and-images.net
-pinkduck.ga
-pio.polytopesexempt.com
-pisanieprac.info
-pixelrz.com
-pkr1hand.com
-plusnetwork.com
-poffet.net
-porno-dojki.net
-porn-w.org
-poshiv-chehol.ru
-powenlite24.ru
+incomekey.net
+indiasourcemart.in
+insta-add.pro
+islamtoday.co.za
+jmat.cn
+jolic2.com
+jwss.cc
+karachev-city.ru
+karaganda.xkaz.org
+karpun-iris.ru
+keywordglobal.co.za
+keywordhouse.com
+keywords-monitoring-your-success.com
+keywordsuggests.com
+kit-opt.ru
+klumba55.ru
+koptims.tiu.ru
+labplus.ru
+lampokrat.ws
+lecbter-relationships.ga
+levaquin750mg.blogspot.com
+lifehacĸer.com
+link.ac
+liveinternet.ru
+mebel-ekb.com
+meduza-consult.ru
+mindeyegames.com
+minecraft-neo.ru
+mirtorrent.net
+misandesign.se
+mjchamonix.org
+mmofreegames.online
+mobplayer.ru
+monclerjacketsoutlet.pw
+monclervests.xyz
+montazhnic.ru
+myanyone.net
+myonigroup.com
+myseoconsultant.com
+netpics.org
+nicovideo.jp
+nordvpn.com
+novodigs.com
+nufaq.com
+ohmyrings.com
+onemantrip.com
+ostrovtaxi.ru
+ourville.info
+paparazzistudios.com.au
+parlament.biz
+partnersafe.men
+patol01.pw
+pc-services.ru
+pc-virus-d0l92j2.pw
+phormchina.com
+photo.houseofgaga.ru
+picturesmania.com
+piulatte.cz
+pozvonim.com
 presleycollectibles.com
-pricheskaonline.ru
-princeadvantagesales.com
-privatbank46.ru
-prokotov.com
-promodj.com
-proposal-engine.com
-pro-tec.kz
-purplestats.com
-puserving.com
+privhosting.com
+projefrio.com.br
+promalp-universal.ru
+promgirldresses.xyz
+psa48.ru
+pukaporn.com
 py100.ru
-pyrodesigns.com.au
-qcstrtvt.bloger.index.hr
-randki-sex.com
-rankingchart.de
-relax.ru
-renecaovillasale.online
-rennlist.com
-rique.host.sk
+rapidsites.pro
+registrysweeper.com
+remont-komputerov-notebook.ru
+richinvestmonitor.com
 robot-forex.biz
-rubanners.com
-samara.rosfirm.ru
-saneitconsulting.com
-satellite.maps.ilovevitaly.com
-scanmarine.info
-scanner-andrew.top
-scanner-margo.top
-scanner-marwin.top
-searchaddis.com
-searchmywindow-a.akamaihd.net
-seo-prof1.xyz
-seorankinglinks.us
-servicecenter.co.ua
-serviporno.com
-sexad.net
+rock-cafe.info
+rogervivierforsale.com
+royal-investments.net
+saneyes.com
+sayyoethe.blogspot.co.za
+screentoolkit.com
+scripted.com
+sc-specialhost.com
+sdelatmebel.ru
+searchinquire.com
+sel-hoz.com
+seofied.com
 sexkrasivo.net
-sexy-screen-savers.com
-shell-pmr.ru
-shikiso.info
-shoesonlinebuy.cn
-sinestesia.host.sk
+sharebutton.net
+shitmovs.com
+simple-share-buttons.com
 sivs.ru
-spymac.net
-stardevine.com
-staynplay.net
-stroymonolit.su
-superoboi.com.ua
-suture.co
-svetlotorg.ru
-t-bygg.com
-thaisamkok.com
-thebluffs.com
-theporndude.com
-tizanidinedrugtest.blogspot.com
-tizanidineformigraines.blogspot.com
-tizanidinehcl4mgtablet.blogspot.com
-tizanidinesideeffects.blogspot.com
-top250movies.ru
-topsy.com
-torrents.cd
-tozup.com
-turvgori.ru
+sizeplus.work
+slim.sellany.ru
+sms2x2.ru
+snjatie-geroinovoy-lomki.ru
+soft-program.com
+softxaker.ru
+solitaire-game.ru
+sstroy44.ru
+sukirgenk.dvrlists.com
+swagbucks.com
+sweepstakes.rewardit.com
+sygraem.com
+t3chtonic.com
+taihouse.ru
+takeprofitsystem.com
+tattomedia.com
+tedxrj.com
+terrafootwear.us
+tizanidinedruginteractions.blogspot.com
+tizanidinestreetvalue.blogspot.com
+top-karkas.ru
+tuberkulezanet.ru
+turbabitload.weebly.com
 twitlinks.com
-usdx.us
-userequip.com
-uzungil.com
-vacances-voyages.info
-varikoz24.com
-videospornogratisx.net
-vipsiterip.org
-vitoriacabos.com
+ufa.xrus.org
+uprour.com
+vandrie-ict.nl
+videtubs.pl
+vip2ch.com
 vksaver-all.ru
-vodkoved.ru
-voluumtrk.com
-voronezh.xrus.org
-vysigy.su
-vzlom-na-zakaz.com
-web-betting.ru
-webmasterhome.cn
-witherrom55.eklablog.fr
-withstandingheartwarming.com
-wordpresscore.com
-worldtraveler.world
-worst-sites.online
-xn----7sbbahaq9bb5afgiqfliv4m.xn--p1ai
-xn--80ak6aa92e.com
-xn--h1aakne2ba.xn--p1ai
+volgograd.xrus.org
+white-truck.life
+wholesalejerseychinashop.com
+wingsoffury2.com
+wsgames.ru
+xaylapdiendanang.com
+xgftnlrt.bloger.index.hr
+xn----7sbifcamovvfggw9d.xn--p1ai
+xn----8sbdbjgb1ap7a9c4czbh.xn--p1acf
+xn--d1aifoe0a9a.top
+xxxtube69.com
+yaaknaa.info
+youdesigner.kz
 yougotanewdomain.com
-your-bearings.com
-ypmuseum.ru
-zakonobosago.ru
+zagadki.in.ua
+zolotoy-lis.ru
+zoompegs.com
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 34cb39aec..bc389ee32 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-34.66.178.120	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 5968eeaeb..4a2768e9d 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 984a54a4b..1e1863161 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 90a7dddc0..628972af0 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1744
+#### Version: V4.2019.07.1745
 #### Bad Referrer Count: 6719
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index ad27c0b21..8111a9d8a 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1744
+#### Version: V4.2019.07.1745
 #### Bad Referrer Count: 6719
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index e32a9f85c..de85d3fd2 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.1744
+#### Version: V4.2019.07.1745
 #### Bad Referrer Count: [6719](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 20b550acf..0d91a65b2 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.1744
+#### Version: V4.2019.07.1745
 #### Bad Referrer Count: 6719
 #### 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 8927a1cdc..e125a9747 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.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist-testing-version.conf b/conf.d/globalblacklist-testing-version.conf
index 6e728f367..7de8efe9e 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.1744
-### Updated: Wed Jul  3 15:06:57 SAST 2019
+### Version: V3.2019.07.1745
+### Updated: Wed Jul  3 15:34:01 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index 8927a1cdc..e125a9747 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1744
-### Updated: Wed Jul  3 15:06:55 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:33:59 SAST 2019
 ### Bad Referrer Count: 6719
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index 93b246484..75a21ce1d 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1744
-### Updated: Wed Jul  3 15:06:58 SAST 2019
+### Version: V4.2019.07.1745
+### Updated: Wed Jul  3 15:34:02 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##