diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index e0433aa10..b1004a074 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.1706
-### Updated: Mon Jul  1 09:31:50 SAST 2019
+### Version: V3.2019.07.1707
+### Updated: Mon Jul  1 10:00:10 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 0fcb73d00..746c3f03f 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.192.187.174	1;
+35.224.112.202	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 3dac4f84e..500584a94 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.192.187.174	0;
+35.224.112.202	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 e0433aa10..b1004a074 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.1706
-### Updated: Mon Jul  1 09:31:50 SAST 2019
+### Version: V3.2019.07.1707
+### Updated: Mon Jul  1 10:00:10 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 0fcb73d00..746c3f03f 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.192.187.174	1;
+35.224.112.202	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 3dac4f84e..500584a94 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.192.187.174	0;
+35.224.112.202	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 e0433aa10..b1004a074 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.1706
-### Updated: Mon Jul  1 09:31:50 SAST 2019
+### Version: V3.2019.07.1707
+### Updated: Mon Jul  1 10:00:10 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 0fcb73d00..746c3f03f 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.192.187.174	1;
+35.224.112.202	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 3dac4f84e..500584a94 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.192.187.174	0;
+35.224.112.202	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 e0433aa10..b1004a074 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.1706
-### Updated: Mon Jul  1 09:31:50 SAST 2019
+### Version: V3.2019.07.1707
+### Updated: Mon Jul  1 10:00:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index e0433aa10..b1004a074 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1706
-### Updated: Mon Jul  1 09:31:50 SAST 2019
+### Version: V3.2019.07.1707
+### Updated: Mon Jul  1 10:00:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index 94c91beec..703a74a13 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 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 6073098c1..798770665 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
-34.66.178.120           0;
+35.188.1.99             0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index 94c91beec..703a74a13 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
index 0f27f0dd9..746c3f03f 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	1;
+35.224.112.202	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index 0e0848852..500584a94 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	0;
+35.224.112.202	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
index 94c91beec..703a74a13 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
index 0f27f0dd9..746c3f03f 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	1;
+35.224.112.202	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index 0e0848852..500584a94 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	0;
+35.224.112.202	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
index 94c91beec..703a74a13 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
index 0f27f0dd9..746c3f03f 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	1;
+35.224.112.202	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
index 0e0848852..500584a94 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	0;
+35.224.112.202	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
index 94c91beec..703a74a13 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
index 27c6e6297..3767371d9 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
-104.198.131.58          0;
-35.192.136.167          0;
+35.188.1.99             0;
+104.154.120.187         0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index e23b06a87..8b8457f10 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
index 9496d4553..3709e22c8 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
-34.66.178.120           0;
-35.192.187.174          0;
+104.154.120.187         0;
+35.184.96.71            0;
+35.184.226.236          0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index 94c91beec..703a74a13 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
index 38e52c511..1064de76f 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,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.192.187.174          0;
-35.193.14.140           0;
-34.68.144.114           0;
+35.184.226.236          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 94c91beec..703a74a13 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 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 0fcb73d00..746c3f03f 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	1;
+35.224.112.202	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 3cd6c3c7f..36aae8041 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 @@
-DomainCrawler
-Extractor
-IlseBot
-Iskanie
-Mediatoolkitbot
-Microsoft Data Access
-Spinn3r
-The Intraformant
-VoidEYE
-WebBandit
+404checker
+Copier
+DataCha0s
+Freeuploader
+GridBot
+Hloader
+NetAnts
+OpenLinkProfiler
+sp_auditbot
+SuperHTTP
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index 6cd8cb470..7044519d7 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 @@
 404enemy
-80legs
 Abonti
-Acunetix
-ADmantX
+Aboundex
+Aboundexbot
+AfD-Verbotsverfahren
 AIBOT
 AiHitBot
-Aipbot
-Alligator
+Alexibot
 AllSubmitter
-AlphaBot
-Anarchie
-ASPSeek
-Asterias
+Attach
+backlink-check
+BacklinkCrawler
+BackWeb
 Badass
-Bandit
-Barkrowler
 BBBike
+BDCbot
 Bigfoot
 Bitacle
-BlackWidow
+Black Hole
 BLEXBot
-BlowFish
-Boardreader
-Brandwatch
-Buddy
+BotALot
 BuiltBotTough
-Bullseye
-CATExplorador
+BunnySlippers
+Calculon
 CCBot
-Cegbfeieh
-CherryPicker
-CheTeam
+ChinaClaw
+Chlooe
+Cloud mapping
+coccocbot-web
 cognitiveseo
-Collector
-com.plumanalytics
 Copier
 CopyRightCheck
-Cosmos
-Craftbot
-CrazyWebCrawler
+crawler4j
+crawler.feedback
+crawl.sogou.com
+Crescent
 CrunchBot
-CSHttp
-DatabaseDriverMysqli
-DataCha0s
-DBLBot
+Curious
+Custo
+Demon
+Deusu
 Devil
-DIIbot
+Digincore
+Disco
+Discobot
+Discoverybot
 Dispatch
 DomainCrawler
-DomainSigmaCrawler
 Dotbot
-EirGrabber
+Drip
+DSearch
+EasyDL
+Ebingbong
+ECCP/1.0
+Ecxi
+EMail Siphon
+EMail Wolf
 EroCrawler
 evc-batch
+Evil
 Exabot
-Express WebPictures
-ExtLinksBot
 Extractor
-Extreme Picture Finder
-EyeNetIE
-Ezooms
+ExtractorPro
+FDM
 FHscan
-Fimap
-Firefox/7.0
-FlashGet
 Flunky
-Foobot
+Freeuploader
 FrontPage
-FyberSpider
 Fyrebot
-GalaxyBot
 GermCrawler
+Getintent
 GetRight
-Gotit
-Go!Zilla
+Gigablast
 Grabber
 GrabNet
-GrapeshotCrawler
-GridBot
-HaosouSpider
-Heritrix
+GT::WWW
+Haansoft
+HEADMasterSEO
 Hloader
-Humanlinks
-Iblog
-IlseBot
+HTTP::Lite
+IDBot
+Id-search
 Image Sucker
-IndeedBot
+Indy Library
 InfoNaviRobot
-InfoTekies
 InterGET
-Internet Ninja
 internetVista monitor
-ips-agent
-IRLbot
-Iskanie
-IstellaBot
+Iria
 JetCar
-JikeSpider
+Jetty
 Joomla
 Jorgee
 JustView
-Kenjin Spider
-LeechFTP
+Keyword Density
 LeechGet
-Lftp
-LibWeb
 Lightspeedsystems
-Likse
+LinkextractorPro
+LinkScan
 LinksManager
-Lipperhey
-Litemage_walker
+LinkWalker
+LinqiaScrapeBot
 LNSpiderguy
-Ltx71
-lwp-request
 LWP::Simple
 lwp-trivial
 Mag-Net
 magpie-crawler
-Majestic12
+Majestic SEO
 Majestic-SEO
+MarkMonitor
 MarkWatch
-Masscan
+Mass Downloader
 Mata Hari
+meanpathbot
 MeanPath Bot
-Mediatoolkitbot
-Microsoft Data Access
-MIIxpc
-Mister PiX
-Mojeek
-Morfeus Fucking Scanner
-Mr.4x3
-MSFrontPage
+mediawords
+MFC_Tear_Sample
+Microsoft URL Control
+MIDown tool
+MJ12bot
 MSIECrawler
-Msrabot
-NearSite
+MS Web Services Client Protocol
+muhstik-scan
+Musobot
+Name Intelligence
+Navroad
 Nessus
-Netcraft
-netEstate NE Crawler
-NextGenSearchBot
-Nibbler
-NICErsPRO
+NetAnts
+NetLyzer
+NetMechanic
+Net Vampire
+NetZIP
 Niki-bot
+Nikto
+Nimbostratus
+Ninja
+Nmap
 Nutch
-Octopus
-Offline Explorer
-Offline Navigator
+OnCrawl
 Openfind
-OpenLinkProfiler
+Openvas
 OpenVAS
-OrangeBot
-OutclicksBot
 OutfoxBot
 PageAnalyzer
-Page Analyzer
 PageGrabber
-page scorer
-Pandalytics
 Panscient
+Papa Foto
 pcBrowser
+PECL::HTTP
 PeoplePal
 Picsearch
-plumanalytics
-Pockey
-Probethenet
+PictureFinder
+ProWebWalker
 Pump
-QueryN Metasearch
-RankActive
 RankActiveLinkBot
 RankFlex
-Rankivabot
+RankurBot
+RealDownload
 Reaper
-RebelMouse
-Recorder
-RedesScrapy
 ReGet
-Ripper
-s1z.ru
+Rogerbot
 SalesIntelligent
-SBIder
+ScoutJet
 Scrapy
 Screaming
-ScreenerBot
-Seomoz
-SEOprofiler
-seoscanners
+Semrush
+SEOlyticsCrawler
 SEOstats
+sexsearcher
+Shodan
+Sitebeam
 Siteimprove
+SiteLockSpider
+SiteSnagger
+SiteSucker
 Site Sucker
-Sitevigil
+SlySearch
 Snake
-Snapbot
+SocialRankIOBot
+Sociscraper
 sogouspider
-Sottopop
+SpaceBison
 Spammen
-sp_auditbot
-Sqlworm
+Spanner
+Spinn3r
+SputnikBot
+spyfu
 Sqworm
-Steeler
-Stripper
 Sucker
 Sucuri
-SuperBot
+SuperHTTP
+Suzuran
+Swiftbot
+sysscan
 Szukacz
 tAkeOut
-TeleportPro
+Telesphoreo
 Telesphorep
 The Intraformant
-Titan
+TheNomad
+Thumbor
+TightTwatBot
 Toata
 Toweyabot
-trendiction.de
+Tracemyfile
+True_Robot
 Turnitin
-TurnitinBot
-Twice
 Upflow
 URLy Warning
-Vacuum
-VB Project
 VCI
+VidibleScraper
 Virusdie
-Voil
-Voltron
-Wallpapers/3.0
 WallpapersHD
-WebBandit
-WebCollage
+WASALive-Bot
+Webalta
+Web Auto
 Web Collage
-WEBDAV
+WebEnhancer
+Web Enhancer
+WebFetch
 Web Fetch
+WebFuck
+WebImageCollector
 webmeup-crawler
+Web Pix
 WebReaper
+WebSauger
 Web Sauger
-WebsiteQuester
-WeSEE
-Whacker
-Whatweb
+Webshag
+WebsiteExtractor
+Website Quester
+WebStripper
+WebSucker
+Web Sucker
+WebWhacker
+WebZIP
+Who.is Bot
+Widow
 WISENutbot
+Wonderbot
 Wotbox
-Wprecon
-WWWOFFLE
+WWW-Collector-E
+WWW::Mechanize
+x09Mozilla
 x22Mozilla
+Xaldon_WebSpider
 xpymep1.exe
-YoudaoBot
-Zade
-Zermelo
 Zeus
+zgrab
 Zitebot
 ZmEu
-ZumBot
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index 25d5351db..728a97d47 100644
--- a/.dev-tools/test_units/random-bots-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-bots-for-whitelist-test.list
@@ -1,250 +1,250 @@
-80legs
+404checker
+404enemy
 Abonti
-Aboundex
-Aboundexbot
-AfD-Verbotsverfahren
+Acunetix
+AIBOT
 Alexibot
 AllSubmitter
+AlphaBot
+Apexoo
+archive.org_bot
 ASPSeek
+Attach
 BackDoorBot
-backlink-check
+BacklinkCrawler
 BackStreet
+Badass
+Bandit
+Barkrowler
 BatchFTP
-Battleztar Bazinga
-BBBike
+BDFetch
 BetaBot
-Bigfoot
+Bitacle
 Blackboard
 Black Hole
-Boardreader
-BotALot
+BlackWidow
+Blow
+Bolt
 Brandprotect
 Brandwatch
 Buddy
+BuiltBotTough
 BuiltWith
-Bullseye
 BunnySlippers
+Calculon
+CATExplorador
 CazoodleBot
-CheeseBot
+Cegbfeieh
 CherryPicker
-CheTeam
+ChinaClaw
+Cliqzbot
 Cloud mapping
 Cogentbot
-com.plumanalytics
 Copier
 Copyscape
 Craftbot
-crawler.feedback
+crawler4j
 crawl.sogou.com
 CrazyWebCrawler
-Crescent
-CrunchBot
-CSHttp
 Custo
-DigitalPebble
+DatabaseDriverMysqli
+DBLBot
+Demon
+Deusu
 DIIbot
-Discoverybot
-DittoSpyder
+Disco
+Dispatch
+DnyzBot
 DomainAppender
-DomainCrawler
-DomainSigmaCrawler
-Dotbot
 Download Wonder
-Drip
+Dragonfly
 DSearch
-DTS Agent
-EasyDL
-Ecxi
+Ebingbong
+eCatch
+ECCP/1.0
 EirGrabber
 EMail Siphon
-EroCrawler
-evc-batch
+EMail Wolf
+Evil
+ExtLinksBot
+Extractor
+ExtractorPro
 EyeNetIE
-Ezooms
-FemtosearchBot
-FrontPage
-FyberSpider
+Firefox/7.0
+FlashGet
+Foobot
+Freeuploader
 Fyrebot
-Genieo
+GalaxyBot
 GermCrawler
-Gigablast
+Getintent
 Gigabot
-Go-Ahead-Got-It
-GoZilla
-Grafula
-GrapeFX
-GridBot
-GT::WWW
-Haansoft
+Grabber
+GrapeshotCrawler
 Harvest
+Havij
 HEADMasterSEO
-Heritrix
-HMView
+Hloader
 HTTP::Lite
-Id-search
+HybridBot
+Iblog
+IDBot
 IlseBot
 Image Sucker
+IndeedBot
 InfoNaviRobot
 InfoTekies
-instabid
-internetVista monitor
-ips-agent
-IRLbot
-JamesBOT
+IstellaBot
+Jbrofuzz
 JennyBot
-JetCar
-Jetty
 JikeSpider
 JOC Web Spider
 Joomla
-Jorgee
-Kenjin Spider
+Jyxobot
+Keyword Density
 Kozmosbot
-Lanshanbot
 LeechFTP
-Lftp
 LibWeb
-Libwhisker
 Lightspeedsystems
+Likse
 Linkdexbot
 LinkextractorPro
-LinkpadBot
-LinksManager
-LinqiaRSSBot
 LinqiaScrapeBot
-Lipperhey Spider
+Lipperhey
+lwp-request
+lwp-trivial
 Mag-Net
-magpie-crawler
+Mail.RU_Bot
+Majestic12
 Majestic SEO
-MarkMonitor
-Mata Hari
+Majestic-SEO
+MauiBot
 Meanpathbot
 MeanPath Bot
+mediawords
 Metauri
-Microsoft Data Access
-Microsoft URL Control
-MSIECrawler
-NetAnts
+MFC_Tear_Sample
+MIDown tool
+MIIxpc
+Mister PiX
+Mojeek
+Morfeus Fucking Scanner
+MSFrontPage
+Msrabot
+Needle
+Netcraft
+NetLyzer
+NetSpider
 Nettrack
+Netvibes
 NextGenSearchBot
-Niki-bot
-Ninja
+NICErsPRO
+Nikto
+NimbleCrawler
 NPbot
-Nutch
+Octopus
+Offline Explorer
+OpenLinkProfiler
+Openvas
+OrangeBot
+OutclicksBot
 PageAnalyzer
+Page Analyzer
 page scorer
-PageScorer
-Pandalytics
-Panscient
 Papa Foto
-PHPCrawl
+PeoplePal
 Picscout
-PictureFinder
-Pixray
-PleaseCrawl
+Picsearch
+Pimonster
 plumanalytics
-POE-Component-Client-HTTP
 Probethenet
-ProWebWalker
+Pump
 PxBroker
 Quick-Crawler
-RankActive
 RankFlex
-RankingBot
 RankingBot2
-RealDownload
+Rankivabot
+RankurBot
 Reaper
-Recorder
-RepoMonkey
+ReGet
+Ripper
 RocketCrawler
-s1z.ru
 SalesIntelligent
+SBIder
 ScanAlert
 Scanbot
+scan.lol
+ScoutJet
 Scrapy
-Semrush
-SEOkicks
+Screaming
+ScreenerBot
+Searchestate
+SearchmetricsBot
+SEOkicks-Robot
 seoscanners
+SeoSiteCheckup
 SEOstats
 sexsearcher
-Shodan
 Siphon
-Sitebeam
-SiteExplorer
 SiteSucker
-Sitevigil
-SlySearch
 SMTBot
 Snake
+Snapbot
 SocialRankIOBot
-sogouspider
-Sogou web spider
-Sosospider
-Sottopop
+Sociscraper
 Spammen
 SpankBot
 spyfu
-Sqlworm
 Steeler
-Sucker
-Sucuri
+Stripper
 SuperBot
+SuperHTTP
 Surfbot
+SurveyBot
 Suzuran
-Swiftbot
-Szukacz
-T8Abot
-Telesoft
-Telesphorep
+TeleportPro
 The Intraformant
+TheNomad
+Thumbor
 TightTwatBot
-Toweyabot
-Trendiction
-Turingos
-TurnitinBot
-Upflow
-URLy.Warning
+Titan
+Trendictionbot
+Turnitin
+Twice
+Typhoeus
 Vacuum
-Vagabondo
 VCI
 VidibleScraper
-Virusdie
-VoidEYE
-Voltron
+Voil
 Wallpapers/3.0
 WBSearchBot
 WebAuto
 Web Auto
-WebBandit
 WebCollage
-Web Collage
-WebCopier
 WEBDAV
-WebEnhancer
 Web Enhancer
+WebFuck
 WebGo IS
 WebImageCollector
-Web Sauger
-Webshag
-WebsiteExtractor
-WebsiteQuester
+WebLeacher
+Web Pix
 Website Quester
 WebSucker
 Web Sucker
-WebZIP
+Whack
 Whatweb
 Widow
-WinHTTrack
-WiseGuys Robot
 Wonderbot
+Woobot
 Wotbox
 WPScan
 WWW-Mechanize
-WWWOFFLE
+WWW::Mechanize
 x22Mozilla
 Xaldon WebSpider
 Xenu
 xpymep1.exe
-Zauba
-Zermelo
+Zade
 Zeus
+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 0c75820cb..a80b0d555 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 @@
-activecampaign.dreamhosters.com
-empirepoker.com
-favoritemoney.ru
-handicapbathtubarea.com
-mil-stak.com
-petitions.whitehouse.gov
-rapidsites.pro
-rcpmda.ikan1080.xyz
-token-lab.org
-wladimirpayen.com
+bdsmgalls.net
+break-the-chains.com
+compliance-willy.top
+hobild.net
+oops-cinema.ru
+pc4download.co
+propranolol40mg.blogspot.com
+sa-rewards.co.za
+site-analyzer.com
+vesnatehno.ru
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index cde6a2eaf..4474e75bc 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 @@
-00author.com
-101raccoon.ru
-1millionusd.xyz
-1webmaster.ml
-2728fb936f0.com
-2x2fan.ru
-3dracergames.com
-5kstore.com
-5-steps-to-start-business.com
-7fon.ru
-aa9d046aab36af4ff182f097f840430d51.com
-aac500b7a15b2646968f6bd8c6305869d7.com
-above.com
+13tabs.com
+1bet.com
+40cg.com
+51unlim.ru
+abwa.tk
 accessoires-mode.in
-adelly.bg
-admeasures.com
-admitad.com
-adsland.men
-ads.tremorhub.com
-advertisingtag.net
-adzerg.com
-agadelha.com.br
-alert-jdh.xyz
-allbizne.co.ua
-all-number.com
-alphahoverboards.com
-angry-fermi-7633.arukascloud.io
-anonymizeme.pro
-antons-transporte.de
-apartmentbay.ru
-apessay.com
-apiallgeniusinfo-a.akamaihd.net
-apioasisspacenet-a.akamaihd.net
-appfixing.space
-appiq.mobi
-aramaicmedia.org
-arate.ru
-arendatora.ru
-artdeko.info
-asrvvv-a.akamaihd.net
-avirasecureserver.com
-azadnegar.com
-azazu.ru
-babieca.com
-bag77.ru
-baltgem.com
-bankcrediti.ru
+adconscious.com
+adinterax.com
+admanaerofoil.com
+ads-seo.men
+adultfullhd.com
+advocatemsk.ru
+afora.ru
+akusherok.ru
+allkrim.com
+alltheviews.com
+alpinism.ru
+alveris.ru
+ameblo.jp
+android-style.com
+animaltoplist.com
+apartment.ru
+apparel-offer.com
+appfastplay.com
+apxeo.info
+arenanews.com.ua
+arendakvartir.kz
+artpicso.com
+autolombard-krasnodar.ru
+aviav.ru
+avon-ukraine.com
+azazaporn.com
+babyfactory.fr
+babyguns.ru
+baladur.ru
 bannerads.de
-bannerspace.com
+bannertesting.com
 baoxaydung.com.vn
-begalka.xyz
-best-businessman.ru
-bestdooz.com
-bestimagecoollibrary.com
-best-seo-offer.com
-bezcmexa.ru
+beauty-clinic.ru
+bedandbreakfast.com
+belinka.com.ua
+bestcalovebracelet.cn
+bestmarriages.com
+bestsexyblog.com
 bharatdefencekavach.com
-bigames.online
+bidbuy.co.kr
+bidr.trellian.com
 big-cash.net
-bigcities.org
-bimatoprost-careprost.com.ua
-biznesrealnost.ru
-blobar.org
-blog.axant.it
-blog.f00kclan.de
-bmsco.co
-boole.onlinewebshop.net
-bosefux.esy.es
-bosman.pluto.ro
-browsepulse-a.akamaihd.net
+bioca.org
+blogporn.in
+bluerobot.info
+boazpower.com
+bobba.dzaba.com
+bobinoz.com
+boo-arts.com
+bouda.kvalitne.cz
+braip.com.br
+brg8.com
+brimstonehillfortress.org
+btc4u.ru
+buehne-fuer-menschenrechte.de
+buketeg.xyz
+bum.com.ru
+bumskontakte.org
 buron.pw
-businesn.men
-buyessayonline19.blogspot.ru
-buyk.host.sk
+buy-meds24.com
+buynorxx.com
 buytizanidineonline.blogspot.com
-bvlgariring.xyz
-calstaterealty.us
+callejondelpozo.es
+camdolls.com
 canacopegdl.com
-capture-room.com
-carson.getenjoyment.net
-cartierreplica.xyz
-cbb1smartlist12.click
-cdncash.net
-centrumcoachingu.com
-chastnoeporno.com
-cheapbarbour.online
-cheapcigarettesc.info
-cheapmoncler.pw
-cheap-trusted-backlinks.com
-check-host.net
-christianlouboutinoutlet.win
-cinemaflix.website
-citysecurity.nu
-clarithromycin500mg.com
-clayvasedesigns.tk
-clicksor.net
-cocyq.inwtrade.com
-coinsspb.com
-com-onlinesupport.host
-compliance-elena.xyz
-compliance-fred.top
-compliance-jane.top
-compliance-josh.top
-compliance-margo.top
-contextualyield.com
+candlehandmade.com
+candlewooddentalcentre.com.au
+cardsharp1.ru
+cartierring.xyz
+cartiertrinity.xyz
+cashkitten-a.akamaihd.net
+catalogs-parts.com
+cementaresearch.se
+c-english.ru
+cercacamion.it
+chatroulette.si
+chcu.net
+cheapmoncler.xyz
+checkm8.com
+ciproandtizanidine.blogspot.com
+cleansearch.net
+clippingphotoindia.com
+clodo.ru
+codysbbq.com
+comeondog.info
+constantaservice.net
 cosmetic.donna7753191.ru
-crystalslot.com
-customchocolate.business-for-home.com
+countbertwistdisp26.soup.io
+counter.bloke.com
+counter.yadro.ru
+covadhosting.biz
+crazyprotocol.com
+creatives.adbetclickin.pink
+cubook.supernew.org
+culad.com
+customerguru.in
+cyclobenzaprinevstizanidine.blogspot.com
+cyprusbuyproperties.com
+daneshetabiat.com
+danschawbel.com
 data-mining.tk
-datract.com
-dcj-nn.ru
-dear-diary.ru
-deplim.com
-destinationrealestate.com
-digitalassetmanagement.site
-dignitasdata.se
-dlya-android.org
-documentsite.net
-dominateforex.ml
-doublepimp.com
-dtm-spain.com
-dvervmoskvu.ru
-dvr.biz.ua
-e705.net
-ebooknovel.club
-ecommerce-seo.org
-eduinfosite.com
-ege-essay.ru
-eldiariodeguadalajara.com
-elidelcream.weebly.com
+dekoration.us
+demian.kz
+dentalpearls.com.au
+detalizaciya-tut.biz
+detskie-zabavi.ru
+dev.citetick.com
+dieswaene.com
+dieta-personalna.pl
+dimaka.info
+disruptingdinnerparties.com
+docstoc.com
+doeco.ru
+dogoimage.com
+domaineaneblanc.com
+dorratex.tn
+dpihatinh.gov.vn
+dprtb.com
+druzhbany.ru
+ee77ee.com
+elektrozigarettekaufen2.blogse.nl
+emediate.eu
 empathica.com
-englate.com
-englishgamer.com
-enskedesquashclub.se
-erotik-kostenlos.net
-escortslet.net
-evrotekhservis.ru
-extremepornos.net
-ezigarettenkaufen1.pagina.gr
-ezigaretteshop2.mywapblog.com
-ezigaretteshop.webs.com
-familienzahnaerzte.com
-fantasticpixcool.com
-fbdownloader.com
-filerockstar298.weebly.com
-filmgo.ru
-fil.ru
-finejewelryshop.ru
-food.dtu.dk
-fortwosmartcar.pw
-freeseedsonline.com
-froggytube.com
-fullfileaccess.com
-fullgirl.ru
-fyl.com.ru
-gamedayassist.com
-gaming-journal.com
-gaytube.com
-gdebestkupit.ru
-getoutofdebtfree.org
-getresponse.com
-girlgamerdaily.com
-girlspicsa.com
-golmau.host.sk
-goodnightjournal.com
+en.altezza.travel
+energydiet-info.ru
+epicbrogaming.com
+eralph.tk
+erotische-geschichten-xxl.com
+escortplius.com
+essaypro.com
+eugenevaultstorage.com
+everypony.ru
+expdom.com
+extractorandburner.com
+eyes-on-you.ga
+ezaz.info
+ezb.elvenmachine.com
+ezigarettenshop2.postbit.com
+ezrvrentals.com
+familyphysician.ru
+fanpagerobot.com
+fastfixing.tech
+favornews.com
+fba-mexico.com
+femdom.twiclub.in
+filesvine.com
+filmbokep69.com
+filmi-onlain.info
+financehint.eu
+find1friend.com
+findanysex.com
+fishtauto.ru
+fitness-video.net
+foxweber.com
+freeuploader.ml
+funcrushgames.com
+fxtips.ru
+gamevalue7.weebly.com
+gamingspark.com
+gcup.ru
+girlsfuckdick.com
+gloverid.site
+goldadpremium.com
+goldpanningtools.com
 googlefeud.com
-goroda-vsego-mira.ru
-gourcy.altervista.org
-greatzip.com
-greendream.com.ua
-gsmtlf.ru
-haikuware.com
+google-liar.ru
+goo.ne.jp
+gopixdatabase.com
+gotcher.us
+gotomontenegro.net
+graphicwe.org
+greatdealshop.com
+gsmlab.pl
+guge.io
+gyffu.com
+hackers-crackers.tk
 hamilton.ca
-handicapbathtubarea.com
+harmonyglen.us
+hasfun.com
 hawaiisurf.com
-hazardky.net
+hccoder.info
 hd720kino.ru
-headpharmacy.com
-healbio.ru
-helicalpile.us
-hem.passagen.se
-hifidesign.ru
-highspeed5.net
-hobbyhuren24.net
-hoholikik.club
-homedecorpicture.us
-homeinns.com
-hotxnights.info
-houseofrose.com
-hoverboard360.de
-hoverboard360.nl
-howmuchdoestizanidinecost.blogspot.com
-hunthillfarmtrust.org
-ictizanidinehcl4mg.blogspot.com
-imguramx.pw
-iminent.com
+hd-filmy.net
+healmytrauma.info
+high-speed1.net
+hikesearch.net
+homedo.fabpage.com
+host-tracker.com
+houdom.net
+houston-vikings.com
+hyiphunter.org
+idc.com.ua
+id-forex.com
+imicrovision.com
+i-midias.net.br
 imperia31.ru
-inet-traffic.com
-investingclub.ru
-iqoption-bin.com
-isitpaleo.info
-isotoner.com
-jackpotchances.com
-japan-bearings.ru
-jose.mulinohouse.co
-jovencitas.gratis
-juliadiets.com
-jwss.cc
-kareliatobacco.ru
-karting196.ru
-katushka.net
-kazinogames.lv
-kenaba.su
-keywordhut.com
+impotentik.com
+increasewwwtraffic.info
+insomniagamingfestival.com
+iphantom.com
+iqbazar.ru
+ispaniya-costa-blanca.ru
+jav-fetish.com
+javxxx18.com
+jeremyeaton.co
+jerseywholesalebizchina.com
+jetsli.de
+job.icivil.ir
+kakadu-interior.com.ua
+kandidos.com
+karpun-iris.ru
+kerch.site
+ketrzyn.pl
+keywordhouse.com
+kino2018.club
+kinobaks.com
 kino-rating.ru
-kiwe-analytics.com
-kletkimehan.ru
-klin3952.ru
+kndxbkdx.bloger.index.hr
 kollesa.ru
-kovesszucs.atw.hu
-kredit-blog.ru
-kumuk.info
-ladov.ru
+kostenloser-sex.com
+krassh.ru
+kupiproday.com.ua
+kustanay.kz
 lampokrat.ws
-lasvegaslockandsafe.com
+lanadelreyfans.us
+landreferat.ru
 laudit.ru
-laulini.soclog.se
-letslowbefast.today
-lexaprogeneric.link
-life.biz.ua
-lifebyleese.com
-lifehacĸer.com
-life-instyle.com
-liffa.ru
-lignofix.ua
-link.ac
-liran-locks.com
-liumimgx.pw
-liveinternet.ro
-localflirtbuddies.com
-lonerangergames.com
-long-beach-air-conditioning.com
-lookingglassemb.com
-lovasszovetseg.hu
-love-baby.cz
-lulea-auktionsverk.se
-magicdiet.gq
-makis.nu
-manifestation.betteroffers.review
-marketland.ml
-mecash.ru
+lazymanyoga.com
+leadn.pl
+lechtaczka.net
+livefixer.com
+liveinternet.ru
+lombia.co
+lotto6888.com
+louboutinreplica.pw
+luxup.ru
+macdamaged.space
+magazin-pics.ru
+magicalfind-a.akamaihd.net
+maladot.com
+manve.info
+marmotstore.online
+matpre.top
+mcnamaratech.com
+mebel-ekb.com
+meddesk.ru
+medictube.ru
+medkritika.ru
 medosmotr-ufa.ru
-members.ghanaweb.com
-menhealed.net
-methodsmarketing.com
-microsearch.ru
+meetingrainstorm.bid
+mhi-systems.ru
+milblueprint.com
+mindeyegames.com
+minegam.com
 miniads.ca
-mirmedinfo.ru
-mister-shop.com
-moesen-ficken.com
-moetomnenie.com
-mojowhois.com
-moncleronline.xyz
+mistr-x.org
+mlvc4zzw.space
+mobplayer.net
+moivestiy.biz
+monclerboots.xyz
+monclerjacketsoutlet.pw
+monsterdivx.com
 mosdverka.ru
-moviezbonkerssk.cf
-mozello.ru
-muabancantho.info
-music7s.me
-muz-shoes.ru
-myonlinepayday.co
-mypornfree.ru
+mossmesi.com
+mototsikl.org
+mrsdalloways.com
+msfsaar.de
+musirc.com
+muz-baza.net
+mybinaryoptionsrobot.com
+mylida.org
 mystats.xyz
-nelc.edu.eg
-networkcheck.xyz
-news-speaker.com
-newstaffadsshop.club
-nikhilbahl.com
-nootrino.com
-nordvpn.com
-northfacestore.online
-notasprensa.info
-nrv.co.za
-nsatc.net
-oddamzadarmo.eu
-oecnhs.info
-offer.camp
-okmusic.jp
-ok.ru
-olympescort.com
-onlinadverts.com
-online-sbank.ru
-o-o-6-o-o.com
-openfrost.com
-palvira.com.ua
-pammik.ru
-patterntrader-en.com
-pcads.ru
-perosan.com
-pic2fly.com
-piccshare.com
-picsfair.com
+myxdate.info
+nailsimg.com
+narco24.me
+netfacet.net
+newstudio.tv
+nextrent-crimea.ru
+ngps1.ru
+nibbler.silktide.com
+o00.in
+oakleyglassesonline.us
+odoratus.net
+offers.bycontext.com
+onemactrckr.com
+onlainbesplatno.ru
+onlyforemont.ru
+onlywoman.org
+ooo-gotovie.ru
+orgasmatrix.com
+osnova3.ru
+osoznanie-narkotikam.net
+ostrovtaxi.ru
+ourville.info
+paperwritingservice17.blogspot.ru
+pattersonsweb.com
+pb-dv.ru
+pc-virus-d0l92j2.pw
+pdn-4.com
+peekyou.com
+perm-profnastil.ru
+pharmacyincity.com
+photorepair.ru
+picsearch.com
 picturesboss.com
-pijoto.net
-pills24h.com
-pinkduck.ga
+picturesmania.com
+pinstake.com
+pinwallpaper.top
+pistonclasico.com
+piter.xrus.org
+pixgood.com
+plastweb.ru
 playfortuna-play.ru
-pliks.pl
-pogodnyyeavarii.gq
-popander.mobi
-porno-play.net
-porno.simple-image.com.ua
-pornowarp.info
-pornstartits.xblog.in
-portadd.men
-pourvous.info
-predominant-invent.tk
-prizestohandle.club
-prodvigator.ua
-profitsport.club
-promoheads.com
-promover.org
-proprostatit.com
-pro-tec.kz
+play.leadzupc.com
+poem-paying.gq
+pogruztehnik.ru
+polybuild.ru
+pony-business.com
+popmarker.com
+popserve.adscpm.net
+pornogad.com
+porno-transsexuals.ru
+pozdravleniya-c.ru
+preparevideosafesystem4unow.space
+priceg.com
+privatbank46.ru
+profitwithalex.info
 proxyradar.com
-psa48.ru
-q-moto.ru
-questionmarque.ch
-raavidesigns.com
-rabotaetvse.ru
-rainbowice.ru
-ranking2017.ga
-ranksonic.info
-realitykings.com
+pushdata.sendpulse.com
+pussyfleet.com
+quick-offer.com
+rabot.host.sk
+rankia.com
+rankings-analytics.com
+rankscanner.com
+rapidsites.pro
+razleton.com
+r-control.ru
 realizmobi.com
-recinziireale.com
-remote-dba.de
-rep-am.com
-resant.ru
-reyel1985.webnode.fr
-richinvestmonitor.com
-riders.ro
-rightenergysolutions.com.au
-ringtonepartner.com
-rique.host.sk
-rogervivierforsale.com
-royalads.net
-roznica.com.ua
-running-line.ru
-rusoft-zone.ru
-rus-teh.narod.ru
-rybalka-opt.ru
-sad-torg.com.ua
-sampleletters.net
-saratov.xrus.org
-sbwealthsolutions.ca
-scanner-willy.top
-scenarii-1-sentyabrya.uroki.org.ua
-search.1and1.com
-search-error.com
-searchkut.com
-seoholding.com
-seojokes.net
-sexad.net
-sexfreepornoxxx.com
-sex.hotblog.top
-sexvideo-sex.com
-sexy-screen-savers.com
-sexyteens.hol.es
-sexytrend.ru
-shopperifymac.com
-sideeffectsoftizanidine.blogspot.com
-silvercash.com
-similardeals.net
-simple-image.com.ua
-sinestesia.host.sk
-sisi-go.ru
-sispe.com.br
-site-auditor.online
-siteripz.net
-site.ru
-s-iwantyou.com
-sixcooler.de
-snip.to
-socialseet.ru
-softomix.net
-solitaire-game.ru
-sonnikforme.ru
-sovetogorod.ru
-space4update.pw
-spasswelt.xyz
-spb.afora.ru
-spidtest.org
-spywarebegone.com
-srecorder.com
-sr-rekneskap.no
-ssconstruction.co
-statoutlook.info
-steelmaster.lv
-stillmiracle.com
-streetfooduncovered.com
-strigkaomsk.ru
-stroyhelp-dv.ru
-studiofaca.com
-studiofmp.com
-sugarlyflex.pw
-supernew.org
-supers.com.ua
-svarbit.com
-svtrd.com
-tackletarts.co
-talant-factory.ru
-taqywu51.soup.io
-tattooreligion.ru
-tdsing.ru
-thebestphotos.eu
-thebluenoodle.com
-thetattoohut.com
-titan-cloud.life
-titslove.yopoint.in
-tizanidine4mg.blogspot.com
-tizanidinehcl2mgsideeffects.blogspot.com
-tizanidinepills.blogspot.com
-token-lab.org
-top-deal.com.pl
-topsy.com
-totu.us
-tour-line.net
-trackmedia101.com
+realmonte.net
+realnye-otzyvy.info
+recipedays.com
+reckonstat.info
+redirlock.com
+remontgruzovik.ru
+rennlist.com
+repeatlogo.co.uk
+rosbalt.com.ua
+saecsa.co
+saltspray.ru
+samara.rosfirm.ru
+sardinie.us
+sa-rewards.co.za
+sarm.tk
+savefrom.com
+scanmyphones.com
+scanner-viktor.top
+schoolfiles.net
+searchlock.com
+seasonvar.ru
+seoboxes.com
+seocheckupx.com
+seocheki.net
+seorankinglinks.com
+seo-smm.kz
+servethis.com
+service-core.ru
+sevendays.com.ua
+sexgalleries.top
+sexpornotales.com
+sex-tracker.de
+sexvporno.ru
+sexy.babes.frontend-stack.top
+shemalegalls.blogporn.in
+shop-electron.ru
+silverage.ru
+sisiynas.ru
+skladvaz.ru
+skutecznetabletkinaporostwlosow.pl
+skylta.com
+s.lollypopgaming.com
+snjatie-geroinovoy-lomki.ru
+snow.nvr163.com
+socialsignals24.com
+solnplast.ru
+songoo.wz.cz
+spabali.org
+spaceshipad.com
+spamnuker.com
+spasswelt.net
+spb.ru
+srgwebmail.nl
+stal-rulon.ru
+starwars.wikia.com
+statistici.ro
+steame.ru
+stjamesschool.info
+stretchingabuckblog.com
+stroiminsk.com
+styro.ru
+sudexpert66.ru
+sugarkun.com
+supermama.top
+svetodiodoff.ru
+tagil.zrus.org
+technopellet.gr
+tedy.su
+tehngr.ru
+telefonsexkostenlos.tk
+telsis.com
+tgtclick.com
+themeforest.net
+theplacetoupdating.pw
+tilido.com
+time-japan.ru
+tizanidineandhydrocodone.blogspot.com
+tizanidinewithdrawalsymptoms.blogspot.com
+toloka.hurtom.com
+topdownloads.ru
+topsiteminecraft.com
+torrentdownloadhub.com
+toursmaps.com
+track-rankings.online
+tradgardspartner.se
 trafficmonetize.org
-traffmonster.info
-truck-land.life
-tube8.com
-tubo360.com
-tuckermktg.com
-tupper-posuda.ru
+trafficstars.com
+trkdf.com
+truck-rece.life
+truebeauty.cc
+truemfilelj.gq
+tubeline.biz
 tupper-shop.ru
-tvnewsclips.info
-tvorozhnaja-zapekanka-recept.ru
-twincitiescarservice.com
-uasb.ru
-ufa.xrus.org
-ultimateclassicrock.com
-unblocksit.es
-upstore.me
-uptime.com
+turizmus.us
+u17795.netangels.ru
+uchebavchehii.ru
+ukrobstep.com
+unrealcommander.org
 upupa.net
-usdx.us
-valuado.com
-vepad.com
-vereo.eu
-via-energy-order.com
-via-gra.webstarts.com
-video--production.com
-videos-for-your-business.com
-vigrx-original.ru
+usacasino.com
+valkiria-tk.ru
+vapsy.com
+varikozdok.ru
+videochat.cafe
 vinsit.ru
-vip-file.com
-visitcambridge.org
-vitalads.net
-vitanail.ru
-viteonlusarezzo.it
-voloomoney.com
-voprosotvet24.ru
-vpnmouse.com
+vk-mus.ru
+vladimir.zrus.org
+voltrknc1.com
+vozbujdenie.com
+vremya.eu
+vriel.batcave.net
 vvon.co.uk
-vykupavto-krasnodar.ru
-vzlom-na-zakaz.com
-watchdogs-2.ru
-webadvance.club
-webs.com
-webscouter.net
-wejdz-tu.pl
-westum.se
-white-truck.life
-windowssearch-exp.com
-wladimirpayen.com
-womama.ru
+vzubah.com
+watchmygf.net
+wdrake.com
+webextract.profound.net
+webmonetizer.net
+websiteaccountant.de
+weclipart.com
+weekes.biz.tc
+welck.octopis.com
+westen-z.life
+whipme.yopoint.in
+whiteproduct.com
+whosonmyserver.com
+winx-play.ru
+woman-tampon.ru
 wonderfulflowers.biz
-worldhistory.biz
-www.get-free-traffic-now.com
-x-diesel.info
+wpthemedetector.co.uk
+xitjw.info
 x-mix.info
+xmronta.com
 xn-----6kcaacnblni5c5bicdpcmficy.xn--p1ai
 xn----7sbahjd3btneuw1joc.xn--p1ai
-xn--90acenikpebbdd4f6d.xn--p1ai
-xn--b1adccaf1bzj.xn--p1ai
-xn--d1aifoe0a9a.top
-xn--q1a.xn--b1aube0e.xn--c1acygb.xn--p1ai
-yellocloud.be
-yougame.biz
+xn--80aeahghtf8ac5i.xn--p1ai
+xn----8sbarihbihxpxqgaf0g1e.xn--80adxhks
+xn----8sbdbjgb1ap7a9c4czbh.xn--p1acf
+xn----9sbubg3ambdfl1j.xn--p1ai
+xn--c1acygb.xn--p1ai
+x-rates.ru
+xvideosbay.com
+yoshkarola.zrus.org
+yottos.com
+youporn-forum.ga
+yourads.website
+ypmuseum.ru
+yuarra.pluto.ro
 yunque.pluto.ro
-yurgorod.ru
-za-music.mymobiplanet.com
-zapatosenventa.info
-zhorapankratov7.blogspot.com
-zigarettenonl.canalblog.com
+zagadki.in.ua
+zatjmuzu.info
+zdesoboi.com
+zerocash.msk.ru
+zeroredirect10.com
 zigarettenonlinekaufen1.blox.pl
-znakomstvaonlain.ru
-znaturaloriginal.com
-zynax.ua
+zigarettenonlinekaufen2.bloog.pl
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 aff621f47..a7f0ebaf1 100644
--- a/.dev-tools/test_units/random-referrers-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
@@ -1,250 +1,250 @@
-03e.info
-11235813.webzdarma.cz
-2000k.ru
-20pascals.nl
-51unlim.ru
-5elementov.ru
-7yue.org
-98oi.ru
-actionnooz.com
+14b.info
+1-free-share-buttons.com
+1kdailyprofit.me
+21h2o.com
+4pp13.com
+4replicawatch.net
+5-steps-to-start-business.com
+777-club.ru
+8xv8.com
 adloads.net
-adminshop.com
-adprotect.net
-aero2.ru
-algarveglobal.com
-allnews.md
-alt-servis.ru
-amazingninja.com
-angry-fermi-7633.arukascloud.io
+adultwebhosting.info
+alfabot.xyz
+all4invest.info
+all-streaming-media.com
+angel1777.kz
+animebox.com.ua
 apartment.ru
-arate.ru
-arewater.com
-astana.xxxkaz.org
-axbocz.net
-azartmix.com
-baixar-musicas-gratis.com
-bankiem.pl
-barnfurnituremart.com
-beclean-nn.ru
-berrymall.ru
-bestbuy.ca
-bestcalovebracelet.cn
-bestkfiledxd.cf
-best-seo-solution.com
-best-way.men
+apiappenableinfo-a.akamaihd.net
+apiluckyleapnet-a.akamaihd.net
+apiqualitinknet-a.akamaihd.net
+arendatora.ru
+artel116.ru
+automatic-seo.com
+autotrends.today
+autowebmarket.com.ua
+avkzarabotok.info
+babespcs.com
+balitouroffice.com
+balla-boo.se
+bank.uz
+bannertesting.com
+baoxaydung.com.vn
+beauby.ru
+bestsexyblog.com
 bingoporno.com
-bioinnovate.co
-bizru.info
-bmw-ark.ru
-bodybuilding-shop.biz
-bookmark4you.com
-brianhenry.co
-briomotor.co
-browsepulse-a.akamaihd.net
-cartierbracelet.xyz
-cartierlovebracelet.xyz
-cashonads.com
-cheap-trusted-backlinks.com
-cherubinimobili.it
-cobaltpro.ru
-colehaanoutlet.store
-community.allhiphop.com
-compliance-fred.top
-confib.ifmo.ru
-coolingoods.com
-coolyarddecorations.com
-covadhosting.biz
-cpabegins.ru
-cyprusbuyproperties.com
-czat.wp.pl
-dafatiri.com
-darkages.info
-data.vtc.pw
-dating-time-now.com
-ddpills.com
-dev-seo.blog
+bjanshee.ru
+bnt-team.com
+bochemit.com.ua
+boeuklad.com
+bolegapakistan.com
+buzzzg.men
+camel-beach.com
+cand.jp
+cfacarrosserie74.com
+cgi2.nintendo.co.jp
+cleansearch.net
+compliance-alexa.top
+compliance-don.xyz
+construmac.com.mx
+crd.clan.su
+customchocolate.business-for-home.com
+damedingel.ya.ru
 dichvuvesinhhanoi.com
-dirtpics.pw
-discountbarbour.online
-dotmass.top
-downloadkakaotalk.com
-downloads-whatsapp.com
-download-wallpaper.net
-drhomes.biz
+diminishedvalueoforegon.com
+discovertreasure-a.akamaihd.net
+dnsrsearch.com
+docs4all.com
+dojki-hd.com
+dolohen.com
+domain.webkeyit.com
+downtuptv.gq
+dptaughtme.com
+drugstoreforyou.com
+dvrlists.com
+ec-file.info
+ecxtracking.com
+elektronischezigarettekaufen1.myblog.de
+elkacentr.ru
+energy-ua.com
 enginebay.ru
-enternet.ee
-e-poker-2005.com
-exlarseva.webblog.es
-fantasticpixcool.com
+ero-advertising.com
+esnm.ru
+expertblog.info
+extremal-blog.com
+ez8motelseaworldsandiego.com
+ezb.elvenmachine.com
+f5mtrack.com
 faptitans.com
-fashion-stickers.ru
-fatmaelgarny.com
-femdom.twiclub.in
-ferieboligkbh.dk
-firstdrugmall.ru
-flavors.me
-floridahuntingfishingadventures.com
-flowwwers.com
-food.dtu.dk
-forensicpsychiatry.ru
-freesitetest.com
-funcrushgames.com
-g7m.pl
-gambarxkata.co
-games.kolossale.ru
-gaming-journal.com
-gay-site.store
-gemgrab-a.akamaihd.net
-get-your-social-buttons.info
-ggiaro.com
-ghostvisitor.com
-glavprofit.ru
-gne8.com
-goatse.ru
-gotwebsite1.com
-gsbs.com.ua
-guardlink.com
-guiadeserraazul.com
-hasfun.com
-home.myplaycity.com
-housekuba.org
-https-legalrc.biz
-ibb.com.ua
+farm26.ru
+fertilitetsradgivningen.se
+fetlifeblog.com
+find1friend.com
+findthe.pet
+flipper.top
+forex21.ru
+freelifetimefuckbook.com
+gayxperience.com
+gcup.ru
+gearcraft.us
+germetiki.com.ua
+ghernnqr.skyrock.com
+gok-kasten.net
+goosefishpost.bid
+gopixdatabase.com
+gosarhivrt.ru
+gta-club.ru
+hamptonoaks.ca
+hausfrauensex18.com
+hermesreplica.pw
+hexpilot.com
+histock.info
+hitsbox.info
+hoverboard360.es
+icaseclub.ru
+ido3.com
+ilovevitaly.ru
 imagerydatabase.com
-inet-traffic.com
-iyasimasennka.com
-jerseyswholesalechinalimited.com
+iminent.com
+incanto.in.ua
+istizanidineacontrolledsubstance.blogspot.com
+istizanidinelikexanax.blogspot.com
+istock-mebel.ru
+ix20.ru
+jerseywholesalebizchina.com
+jovencitas.gratis
 juliaworld.net
-karaganda.xkaz.org
-kazrent.com
-ketoanhanoi.info
-kinoflux.net
-kliksaya.com
-krynica.info
-kvartira-sutochno.com
+kalb.ru
+karachev-city.ru
+kemerovo.zrus.org
+kerei.ru
+keywesthideaways.co
+klikbonus.com
+kmgamex.cf
+kupiproday.com.ua
 labelwater.se
-lanasshop.ru
-life.biz.ua
-lirunet.ru
-lolnex.us
-louboutinbooties.xyz
-lyrics.home-task.com
-m5home.ru
-machicon-ueno.info
-macresource.co.uk
-masturbate.co.uk
-matematikus.info
-mcadamssupplyco.com
-mearns-tractors.co.uk
-meget.co.za
+lanadelreyfans.us
+lawyersinfo.org
+loadopia.com
+losangeles-ads.com
+macrotek.ru
+mailemedicinals.com
+meendo-free-traffic.ga
+metalonly.info
 mex-annushka.ru
-microsearch.ru
-monetizer.com-01.site
-musezone.ru
-my-cash-bot.co
-mymercy.info
-ngps1.ru
-no-fuel.org
-nordstar.pro
-okel.co
-oren-cats.ru
-orhonit.com
-ovirus.ru
-owathemes.com
-oynat.info
-p-business.ru
-pensplan.com
-picquery.com
-pics-group.com
-pintattoos.com
-piter.xrus.org
-pizdopletka.club
-pl.aasoldes.fr
-play-mp3.com
-pornofeuer.com
-pornokorol.com
-pornoplen.com
+milblueprint.com
+minharevisao.com
+mmgq.ru
+mobilierland.com
+mosrif.ru
+mossmesi.com
+moxo.com
+mydoctorok.ru
+mygameplus.ru
+mypornfree.ru
+myseoconsultant.com
+napalm51.nut.cc
+nastydollars.com
+oakleyglassesonline.us
+odywpjtw.bloger.index.hr
+onlyforemont.ru
+onlythegames.com
+o-o-6-o-o.ru
+orel-reshka.net
+osagonline.ru
+paleohub.info
+papasdelivery.ru
+partner-stop.men
+pcimforum.com
+penisvergrotendepillennl.ovh
+petrovka-online.com
+picswe.com
+pila.pl
+pixshark.com
+play-movie.pl
+playtap.us
+poppen-nw.net
+pornodojd.ru
+pornogig.com
+pornosmola.info
+portal-eu.ru
 praisong.net
-priscilarodrigues.com.br
-projectforte.ru
-projefrio.com.br
-pro-poly.ru
-push-ad.com
-rabot.host.sk
-rankings-analytics.com
-ranksonic.info
-rapevideosmovies.com
-razamicroelectronics.com
-redbottomheels.xyz
-remedyotc.com
-retailwith.com
-ritlweb.com
-royalads.net
-royalcar-ufa.ru
-roznica.com.ua
-scanner-mark.top
-scanner-walter.top
-scanner-willy.top
-search-error.com
-seminarykansas904.ml
-semp.net
-sexspornotub.com
-sexuria.net
-sharebutton.to
-shodanhq.com
-sitevaluation.com
-skincrate.net
-soblaznu.net
-socialbuttons.xyz
-space2019.top
-speechfoodie.com
-speedup-my.site
-spywareit.com
-staynplay.net
-stevemonsen.com
-stickers-market.ru
-supermesta.ru
-tehngr.ru
-thelottosecrets.com
-tizanidine4mg.blogspot.com
-tizanidinedosageforsleep.blogspot.com
-tizanidinehcl2mg.blogspot.com
-tizanidinehcl2mgtablet.blogspot.com
-tizanidineingredients.blogspot.com
-tizanidinemusclerelaxant.blogspot.com
-tk-assortiment.ru
-top10-way.com
-traffic2money.com
-trafficmonetize.org
-trkdf.com
-udayavani.com
+printie.com
+prize44.com
+prlog.ru
+proftests.net
+prokotov.com
+pronorm.fr
+prostitutki-belgoroda.org
+pulseonclick.com
+puzo2arbuza.ru
+q-moto.ru
+realmonte.net
+reimageplus.com
+relax.ru
+remont-mobile-phones.ru
+replicaclub.ru
+rialp.getenjoyment.net
+royalvegascasino.com
+rusenvironmental.net
+s8-nowy-wygraj.comli.com
+sack.net
+scanner-nelson.top
+scrapy.org
+shillyourcoins.com
+shop-electron.ru
+sklad-24.ru
+skutecznetabletkinaporostwlosow.pl
+smokewithrabbits.com
+soft1.ru
+solitaire-game.ru
+sortthemesitesby.com
+streetfire.net
+svensk-poesi.com
+taboola.com
+telefonsexsofort.tk
+thebitcoincode.com
+thefarmergame.com
+thfox.com
+tizanidineforopiatewithdrawal.blogspot.com
+tizanidineshowupondrugtest.blogspot.com
+top-karkas.ru
+tracfone.com
+trackzapper.com
+trafficstars.com
+truck-addzilla.life
+truck-rece.life
+tubeoffline.com
+tuberkuleznik.ru
+tula.mdverey.ru
 uggbootsoutletsale.us
-uggsale.online
-unitygame3d.com
-unrealcommander.com
+unblocksit.es
 usdx.us
-vapeface.club
-vapsy.com
-veles.shop
-velobikestock.com
-videogamesecrets.com
-video--production.com
-vikistars.com
-voloomoney.com
-w3data.co
-warezkeeper.com
-weekes.biz.tc
-wikes.20fr.com
-word-vorlagen.xyz
-xjrul.com
-xn--1-8sbcpb0bdm8k6a.xn--p1ai
-xxxkaz.org
+validdomain.xyz
+valsalud.com
+vchulkax.com
+vduplo.ru
+vegascosmetics.ru
+viagraneggrx.com
+visionwell.com.cn
+volume-pills.biz
+vzglyadriv.kg
+warningwar.ru
+watchdogs-2.ru
+website-speed-check.site
+wfb.hatedriveapart.com
+xblognetwork.com
+x-diesel.com
+xn----7sbahjd3btneuw1joc.xn--p1ai
+xn--80ahvj9e.xn--p1ai
+xn----itbeirbjbi7bc6bh2d.xn--p1ai
+xxx-cam.webcam
 yaaknaa.info
-youbrainboost.asia
+yachts-cruise.info
+yginekologa.com
 yougetsignal.com
-youradexchange.com
-yoursite.com
-yubikk.info
-zaloro.com
-za-music.mymobiplanet.com
-zerocash.msk.ru
+youghbould.wordpress.com
+youporn-ru.com
+yourothersite.com
+zeleznobeton.ru
+zona-aqua.ru
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index a7215fb74..f371d9e5f 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,11 +1,21 @@
-<html>
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
+</html><html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.14.2</center>
 </body>
 </html>
-l>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -116,14 +126,4 @@ l>
 <h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
 <p>This is merely used for testing !!!</p>
 </body>
-</html><!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to NginX</title>
-</head>
-<body>
-<div align=center>
-<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
-<p>This is merely used for testing !!!</p>
-</body>
 </html>
\ No newline at end of file
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index 3b5fea028..a7215fb74 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.txt
@@ -5,7 +5,7 @@
 <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>
diff --git a/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index 3dac4f84e..500584a94 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	0;
+35.224.112.202	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 0c47c42ea..2dba4acef 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 4b5c98c3b..f8d50f911 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 fbeb5c96a..c72fb17bf 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1706
+#### Version: V4.2019.07.1707
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index 6864c496e..663d5badb 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1706
+#### Version: V4.2019.07.1707
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index 8051f8cf0..c55ebd642 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.1706
+#### Version: V4.2019.07.1707
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/_google_analytics_ghost_spam/README.md b/_google_analytics_ghost_spam/README.md
index 1b487a119..90ca00e6e 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.1706
+#### Version: V4.2019.07.1707
 #### 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 94c91beec..703a74a13 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.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist-testing-version.conf b/conf.d/globalblacklist-testing-version.conf
index e0433aa10..b1004a074 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.1706
-### Updated: Mon Jul  1 09:31:50 SAST 2019
+### Version: V3.2019.07.1707
+### Updated: Mon Jul  1 10:00:10 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index 94c91beec..703a74a13 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1706
-### Updated: Mon Jul  1 09:31:48 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:09 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index daf8261b7..aca65d137 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1706
-### Updated: Mon Jul  1 09:31:51 SAST 2019
+### Version: V4.2019.07.1707
+### Updated: Mon Jul  1 10:00:11 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##