diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index e57725ac9..0ea01be7d 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.1722
-### Updated: Mon Jul  1 15:22:53 SAST 2019
+### Version: V3.2019.07.1723
+### Updated: Mon Jul  1 15:51:53 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 746c3f03f..90fe4f9d3 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 500584a94..bc389ee32 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 e57725ac9..0ea01be7d 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.1722
-### Updated: Mon Jul  1 15:22:53 SAST 2019
+### Version: V3.2019.07.1723
+### Updated: Mon Jul  1 15:51:53 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 746c3f03f..90fe4f9d3 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 500584a94..bc389ee32 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 e57725ac9..0ea01be7d 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.1722
-### Updated: Mon Jul  1 15:22:53 SAST 2019
+### Version: V3.2019.07.1723
+### Updated: Mon Jul  1 15:51:53 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 746c3f03f..90fe4f9d3 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 500584a94..bc389ee32 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 e57725ac9..0ea01be7d 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.1722
-### Updated: Mon Jul  1 15:22:53 SAST 2019
+### Version: V3.2019.07.1723
+### Updated: Mon Jul  1 15:51:53 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/distribution-tests.sh b/.dev-tools/distribution-tests.sh
old mode 100644
new mode 100755
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index e57725ac9..0ea01be7d 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1722
-### Updated: Mon Jul  1 15:22:53 SAST 2019
+### Version: V3.2019.07.1723
+### Updated: Mon Jul  1 15:51:53 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index 87948b6b1..f67b80616 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index 87948b6b1..f67b80616 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 479de1217..966492772 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.192.85.2	1;
+35.184.96.71	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 d9f0a2c04..2f692b069 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.192.85.2	0;
+35.184.96.71	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 87948b6b1..f67b80616 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 479de1217..966492772 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.192.85.2	1;
+35.184.96.71	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 d9f0a2c04..2f692b069 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.192.85.2	0;
+35.184.96.71	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 87948b6b1..f67b80616 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 479de1217..966492772 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.192.85.2	1;
+35.184.96.71	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 d9f0a2c04..2f692b069 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.192.85.2	0;
+35.184.96.71	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 87948b6b1..f67b80616 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 9550b3094..e3688dbe0 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.224.112.202          0;
-35.192.85.2             0;
+35.184.96.71            0;
+35.202.145.110          0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index cd885dd4b..f3561d0c1 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 3767371d9..029e17f41 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,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.1.99             0;
-104.154.120.187         0;
+35.184.96.71            0;
+35.192.85.2             0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index 87948b6b1..f67b80616 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 9550b3094..8ffdf4b15 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
+104.154.120.187         0;
 35.224.112.202          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 87948b6b1..f67b80616 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 746c3f03f..90fe4f9d3 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 12ef73b0a..8102fbaab 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 @@
-Alexibot
-Brandwatch
-internetVista monitor
-Lftp
-Lightspeedsystems
-MegaIndex.ru
-OrangeBot
-OutclicksBot
-WallpapersHD
-Web Collage
+Bandit
+BatchFTP
+Black Hole
+FHscan
+LNSpiderguy
+RankingBot2
+Snoopy
+Sqworm
+WebBandit
+webmeup-crawler
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index 5073d2b09..555d999fa 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 @@
-404checker
-Abonti
+80legs
+Aboundex
 Aboundexbot
+AhrefsBot
 AIBOT
-Aipbot
-AllSubmitter
+Alexibot
 AlphaBot
-Apexoo
 archive.org_bot
 Asterias
-BackDoorBot
-backlink-check
-Badass
+BackStreet
 Bandit
-Barkrowler
-BBBike
-BDCbot
-BetaBot
+BDFetch
 Bigfoot
-Bitacle
 Blackboard
-BlackWidow
-BlowFish
 Boardreader
 Bolt
-BotALot
-Brandwatch
 Buddy
+BuiltBotTough
 Bullseye
-BunnySlippers
-BuzzSumo
 Calculon
+CATExplorador
+CCBot
 Cegbfeieh
-CheeseBot
-CherryPicker
-ChinaClaw
+CheTeam
 Chlooe
 Claritybot
 Cliqzbot
 coccocbot-web
+Cogentbot
 cognitiveseo
-com.plumanalytics
 Copier
 CopyRightCheck
 Copyscape
-Cosmos
-crawler4j
+Craftbot
 crawl.sogou.com
 CrunchBot
+Curious
 Custo
 DataCha0s
 Deusu
-Digincore
+Devil
 DigitalPebble
-DIIbot
+Dirbuster
 Discoverybot
-DomainCrawler
+Dispatch
+DomainSigmaCrawler
 DomainStatsBot
 Download Wonder
-Drip
 DTS Agent
 Ebingbong
-eCatch
 ECCP/1.0
 Ecxi
-EMail Siphon
+EMail Wolf
+EroCrawler
 Exabot
-facebookscraper
-FemtosearchBot
-Fimap
+ExtractorPro
+FDM
+FHscan
 Firefox/7.0
-Fyrebot
-GalaxyBot
+Freeuploader
+FrontPage
 Genieo
 GermCrawler
 GetWeb
 Gigablast
-GrapeFX
-GrapeshotCrawler
+Gigabot
+G-i-g-a-b-o-t
+Gotit
+GoZilla
+Go!Zilla
+GrabNet
+Grafula
 GridBot
-GT::WWW
+Haansoft
+HaosouSpider
+Harvest
 Havij
-HEADMasterSEO
 Heritrix
+Hloader
+HMView
 HTTP::Lite
-HTTrack
-Iblog
+Humanlinks
 IDBot
-IlseBot
+Id-search
+Image Fetch
 Image Sucker
-IndeedBot
+Indy Library
 InfoNaviRobot
-InterGET
+instabid
 InternetSeer
-internetVista monitor
-Iria
 IRLbot
+JennyBot
 JetCar
+Jetty
+JikeSpider
 Joomla
-Jorgee
-Jyxobot
-Kenjin Spider
-Kozmosbot
 Lanshanbot
-LeechFTP
+Larbin
 LeechGet
 LexiBot
+Lftp
+LibWeb
 Libwhisker
-Linkdexbot
-LinkextractorPro
-LinkScan
-LinqiaMetadataDownloaderBot
-Lipperhey
+LinqiaScrapeBot
+Litemage_walker
+Lmspider
 LNSpiderguy
-lwp-request
+Ltx71
 LWP::Simple
-lwp-trivial
+Magnet
+magpie-crawler
+Majestic12
 Majestic SEO
 Majestic-SEO
-Mass Downloader
+MarkWatch
+Masscan
 Mata Hari
-mediawords
-Microsoft Data Access
-Microsoft URL Control
-Mojeek
-Morfeus Fucking Scanner
-MSFrontPage
+Meanpathbot
+MeanPath Bot
+MegaIndex.ru
+MFC_Tear_Sample
+MIDown tool
+Mister PiX
+Mr.4x3
 MS Web Services Client Protocol
 muhstik-scan
-Musobot
-NetAnts
+Nameprotect
+Navroad
+NearSite
+Needle
+NetLyzer
 NetMechanic
 NetSpider
-Nettrack
 Net Vampire
-NICErsPRO
-Nikto
-NimbleCrawler
-Nimbostratus
+Niki-bot
 Nmap
+NPbot
 oBot
 Offline Explorer
 OnCrawl
+Openfind
+OpenLinkProfiler
 OpenVAS
-OrangeBot
-OutclicksBot
-Page Analyzer
+PageAnalyzer
 PageScorer
-Pandalytics
+Panscient
+PECL::HTTP
+Picscout
 Picsearch
-Pimonster
-Pixray
+PictureFinder
+Pi-Monster
+plumanalytics
+POE-Component-Client-HTTP
+Pump
 QueryN Metasearch
-RankActive
-RankurBot
-RebelMouse
+Quick-Crawler
+RankActiveLinkBot
+RankFlex
+RankingBot2
+RealDownload
 Recorder
-RedesScrapy
-Ripper
-SalesIntelligent
+ReGet
+RepoMonkey
+Rogerbot
+s1z.ru
 SBIder
-ScoutJet
-Scrapy
-Screaming
-Semrush
-SemrushBot
-Seomoz
+ScanAlert
+Scanbot
+scan.lol
+ScreenerBot
+SEOkicks
+SEOprofiler
 seoscanners
 SeoSiteCheckup
 SEOstats
+Shodan
 Siphon
 SISTRIX
-Sitebeam
 SiteLockSpider
-SiteSucker
-Snapbot
+Site Sucker
+SlySearch
 SocialRankIOBot
+Sociscraper
 sogouspider
 Sogou web spider
-Sosospider
-Sottopop
-SpaceBison
-SpankBot
+Spammen
+Spanner
 sp_auditbot
-SputnikBot
+Spbot
 Sqlmap
-Stripper
+Sqlworm
+Sqworm
 Sucker
 Sucuri
-SuperBot
-SuperHTTP
-SurveyBot
-Suzuran
 sysscan
-T8Abot
+T0PHackTeam
+tAkeOut
+Teleport
 TeleportPro
-The Intraformant
+Telesphorep
+TheNomad
 Thumbor
-Titan
-Toata
-trendiction.de
+TightTwatBot
+Tracemyfile
+Trendictionbot
 True_Robot
-Turingos
-Turnitin
 TurnitinBot
-Vagabondo
-VB Project
+Twice
+Typhoeus
+Upflow
+URLy.Warning
 VCI
-Virusdie
+VidibleScraper
 VoidEYE
-Voil
-Voltron
-Wallpapers/3.0
 WallpapersHD
 WASALive-Bot
-WebAuto
-Web Auto
-WebCopier
+WBSearchBot
+WebCollage
 WebEnhancer
 Web Enhancer
+WebFetch
 WebFuck
 Web Fuck
 WebGo IS
-WebImageCollector
 WebLeacher
 WebmasterWorldForumBot
+WebPix
+WebReaper
+WebSauger
+WebsiteExtractor
 WebsiteQuester
 Webster
 WebStripper
-Web Sucker
-WebWhacker
 WebZIP
+WeSEE
 Whacker
-Who.is Bot
-Wonderbot
+WiseGuys Robot
+WISENutbot
+Woobot
 Wotbox
 Wprecon
 WPScan
-WWW-Mechanize
-WWWOFFLE
-x09Mozilla
-x22Mozilla
-Xaldon WebSpider
+WWW-Collector-E
 Xaldon_WebSpider
 Xenu
-Zauba
-zauba.io
+Zade
+Zermelo
 zgrab
-Zitebot
-ZyBorg
+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 88669af8e..d5125651e 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
-Abonti
+404enemy
+80legs
 Aboundex
 Aboundexbot
 ADmantX
+AfD-Verbotsverfahren
 AIBOT
-Aipbot
-AllSubmitter
-AlphaBot
-Apexoo
+AiHitBot
+Alexibot
+Anarchie
 Asterias
-BackStreet
-BackWeb
-Barkrowler
-Battleztar Bazinga
+Attach
+BackDoorBot
+Backlink-Ceck
+BacklinkCrawler
+BatchFTP
 BDCbot
+BetaBot
 Bigfoot
-Bitacle
+Blackboard
+Black Hole
+BlackWidow
 Blow
 BlowFish
-BotALot
+Bolt
 Brandwatch
 BuiltBotTough
 BunnySlippers
-BuzzSumo
+CATExplorador
+CazoodleBot
 CCBot
-Cegbfeieh
-CherryPicker
-ChinaClaw
-Chlooe
+CheeseBot
+CheTeam
+Claritybot
+Cloud mapping
 Cogentbot
-cognitiveseo
+Collector
 CopyRightCheck
-Craftbot
-crawler4j
-crawl.sogou.com
-CrunchBot
-CSHttp
-Curious
-DatabaseDriverMysqli
+Cosmos
+crawler.feedback
+CrazyWebCrawler
+Custo
 DBLBot
+demandbase-bot
 Demon
-Devil
+Digincore
+DigitalPebble
 DIIbot
-Dirbuster
 Discobot
-Dispatch
+Discoverybot
 DittoSpyder
-DomainAppender
-DomainStatsBot
-Download Wonder
-DTS Agent
+DomainSigmaCrawler
+DSearch
 eCatch
-EMail Wolf
-evc-batch
-Express WebPictures
+EirGrabber
+EroCrawler
+Evil
+Exabot
 ExtLinksBot
-ExtractorPro
-Extreme Picture Finder
-facebookscraper
+Extractor
+FDM
 FHscan
 Fimap
+Firefox/7.0
+Flunky
 Foobot
-Freeuploader
-FyberSpider
+FrontPage
 Fyrebot
-GetRight
+GalaxyBot
+GermCrawler
+Gigablast
 Gigabot
 G-i-g-a-b-o-t
-GrabNet
-Grafula
-GrapeshotCrawler
+Go-Ahead-Got-It
+Gotit
+GrapeFX
 GT::WWW
+Haansoft
 HaosouSpider
-Heritrix
+Havij
 Hloader
 HMView
-HTTrack
 IDBot
-IndeedBot
-Indy Library
+Image Fetch
+InfoNaviRobot
 instabid
-Intelliseek
+InterGET
 Internet Ninja
 InternetSeer
-ips-agent
 Iria
 IRLbot
-IstellaBot
-Jbrofuzz
+JamesBOT
 JetCar
-Jetty
-JOC Web Spider
-Joomla
+JikeSpider
+JustView
 Jyxobot
-Keyword Density
+Kozmosbot
 Lanshanbot
-Larbin
+LeechFTP
 LeechGet
-LexiBot
 LibWeb
 Libwhisker
 Lightspeedsystems
-Likse
+Linkdexbot
 LinkextractorPro
 LinkpadBot
 LinkScan
+LinksManager
+LinqiaRSSBot
 Lipperhey
 Lipperhey Spider
+Lmspider
+LNSpiderguy
+Ltx71
 lwp-request
-LWP::Simple
-magpie-crawler
-Majestic-SEO
+lwp-trivial
+Mail.RU_Bot
+Majestic SEO
 MarkWatch
 Masscan
-Mata Hari
-meanpathbot
-mediawords
+Meanpathbot
+MFC_Tear_Sample
 Microsoft Data Access
 Microsoft URL Control
-MIIxpc
-Mister PiX
-Morfeus Fucking Scanner
+MJ12bot
+Mojeek
 Mr.4x3
 MSFrontPage
 MSIECrawler
-Msrabot
-Musobot
+MS Web Services Client Protocol
 Nameprotect
-NearSite
-Needle
-Nessus
-NetLyzer
+NetAnts
+netEstate NE Crawler
+NetMechanic
 NetSpider
-Nettrack
-NextGenSearchBot
-Nibbler
-Ninja
-oBot
+Nikto
+Nimbostratus
+Nmap
+Nutch
 Offline Explorer
 OnCrawl
 Openfind
+OpenLinkProfiler
 Openvas
-OrangeBot
 OrangeSpider
+OutfoxBot
+PageAnalyzer
 Page Analyzer
-PageGrabber
 PageScorer
 Pandalytics
 Panscient
 Papa Foto
-pcBrowser
+Pavuk
 PECL::HTTP
 PeoplePal
-Picscout
+PHPCrawl
 PictureFinder
-Pixray
+PleaseCrawl
 plumanalytics
 POE-Component-Client-HTTP
 Probethenet
 ProPowerBot
-Psbot
-PxBroker
+Pump
+PyCurl
 Quick-Crawler
-RankActive
-RankFlex
-RankingBot
+RankActiveLinkBot
 Rankivabot
-RankurBot
 RealDownload
-Reaper
-ReGet
+RebelMouse
 RepoMonkey
-Ripper
 Rogerbot
-s1z.ru
-Scanbot
 scan.lol
 ScoutJet
-Screaming
-Semrush
-SEOkicks-Robot
+ScreenerBot
+Searchestate
+SearchmetricsBot
+SemrushBot
+SEOlyticsCrawler
 SEOprofiler
 seoscanners
-sexsearcher
-Sitebeam
+Shodan
+Siphon
+Siteimprove
+SiteLockSpider
+SiteSnagger
+SiteSucker
+Site Sucker
 Sitevigil
 SlySearch
+Snake
 Snapbot
-Snoopy
-Sociscraper
-Spanner
-sp_auditbot
-SputnikBot
+SocialRankIOBot
+Sogou web spider
+SpaceBison
+Spammen
+Spbot
 spyfu
-Sqlmap
-Sqlworm
 Steeler
-Sucker
 Sucuri
 SuperBot
 SuperHTTP
-Suzuran
-Swiftbot
+SurveyBot
 T0PHackTeam
-tAkeOut
+T8Abot
 Teleport
+Telesphoreo
+Telesphorep
+Thumbor
+TightTwatBot
 Toata
 Tracemyfile
 Trendiction
-Trendictionbot
-True_Robot
+trendiction.de
 Turingos
 TurnitinBot
 TwengaBot
 Typhoeus
-UnisterBot
-URLy.Warning
 VB Project
+VCI
+VeriCiteCrawler
 Virusdie
+VoidEYE
+Wallpapers/3.0
+WallpapersHD
 WASALive-Bot
 WBSearchBot
-WEBDAV
+Webalta
+Web Collage
+WebEnhancer
 Web Enhancer
-WebImageCollector
 WebmasterWorldForumBot
-webmeup-crawler
-Web Pix
-WebReaper
-Web Sauger
 Webshag
-WebsiteExtractor
 WebsiteQuester
-Website Quester
+Webster
 WebSucker
-WeSEE
-Who.is Bot
-Woobot
+Web Sucker
 Wotbox
 Wprecon
+WWW-Collector-E
+WWW-Mechanize
 WWWOFFLE
-Xaldon WebSpider
+x22Mozilla
 Xaldon_WebSpider
 xpymep1.exe
-YoudaoBot
-zauba.io
+Zauba
+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 710585963..f18815daf 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 @@
-1bet.com
-affordablewebsitesandmobileapps.com
-escortplius.com
-hitsbox.info
-pipki.r.acdnpro.com
-summerlinhomes411.info
-survival.betteroffers.review
-top-karkas.ru
-vedomstvo.net
-zajm-pod-zalog-nedvizhimosti.ru
+0n-line.tv
+57883.net
+freewebs.com
+littleberry.ru
+mararoom.ru
+o-o-6-o-o.ru
+ruspdd.com
+simon3.ru
+thaisamkok.com
+yugk.net
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 619d98000..4fd758381 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 @@
-01apple.com
-0daymusic.org
-0lovespells0.blogspot.com
-1001watch.com.ua
-101flag.ru
-1314dh.com
-1millionusd.xyz
-2000k.ru
-40cg.com
-51.la
-7a2rnuey1tw9ar.ru
-aaa38852e886ac4af1a3cff9b47cab6272.com
+08800.top
+1pamm.ru
+23kw.ru
+2pxg8bcf.top
+2rich4bitches.com
+3dracergames.com
+3w24.com
+4webmasters.com
+7xc4n.com
+9icmzvn6.website
+aab94f698f36684c5a852a2ef272e031bb.com
 aac52006ec82a24e08b665f4db2b5013f7.com
-addtoadd.men
-adelly.bg
-adf.ly
-adimmix.com
-adultfriendfinder.com
-advancedcleaner.com
-advancedmassagebysara.com
-advocatemsk.ru
-agadelha.com.br
+aadroid.net
+acgs.tk
+acunetix-referrer.com
+adclickthru.net
+adhome.biz
+afora.ru
+agroeconom.kz
 aimayangzhi.com
-alert.scansafe.net
-all4invest.ru
-allkrim.com
-allnews24.in
-alloysteel.ru
-allpdfmags.net
-allproblog.com
-allwomen.info
-aloofly.com
-altamayoztourism.com
-amospalla.es
-anal-acrobats.com
-android4fun.org
-animalrank.com
-anonymizeme.pro
-appartement-stumm.at
-apple.com-webbrowsing-security.science
-appleid-verification.com
-a.pr-cy.ru
-arendovalka.xyz
+alert-fjg.xyz
+alfa-img.com
+algarveglobal.com
+allmarketsnewdayli.gdn
+allstatesugarbowl.org
+amateurlivechat.org
+amoi.tn
+anapa-inns.ru
+android-vsem.org
+anmysite.com
+apibetweenlinesn-a.akamaihd.net
+apidiamondatanet-a.akamaihd.net
+apimountainbikei-a.akamaihd.net
+apishops.ru
+appsecurityr.com
+arabsexxxtube.com
 artparquet.ru
-asacopaco.tk
-asia-forum.ru
-automatic-seo.com
-avto-oligarh.ru
-azbukadiets.ru
-azbuka-mo.ru
-babosas.com
-backlink4u.net
-banki76.ru
+asophoto.com
+autotrends.today
+avtocredit-legko.ru
+avtovolop.ru
+babespcs.com
+bad-stars.net
+bagsonsale.online
+bannerconnect.net
+bausparen.bz.it
 bcmp.org
-bdsmgalls.net
-beauby.ru
-beauty-things.com
-bedandbreakfast.com
-beget.tech
-bestcurs.org
-best-deals-products.com
-bestmarriages.com
-bestpriceninja.com
-besttorrentknifta.weebly.com
-bet-prognoz.com
-bezsporno.ru
-beztuberkuleza.ru
-bio-market.kz
-bizfly.info
-blockety.co
-blog.axant.it
-bluesman.nu
-boleznikogi.com
-brendbutik.ru
-brimstonehillfortress.org
-brokergid.ru
-browsepulse-a.akamaihd.net
-budilneg.xyz
-bupropion-sr-150-mg.us
-buqyxa.rincian.info
-burn-fat.ga
-buron.pw
-buyclomidonlaine.com
-buyfriend.ru
-buyk.host.sk
+bestcalovebracelet.cn
+bestdooz.com
+besthomemadepornsites.com
+besthoro.ru
+bestofupload.info
+bestpornuha.com
+best-way.men
+beta.hotkeys.com
+bfz.biz
+bibys.com
+bigcareer.info
+binaryoptionscops.info
+bingo8888.com
+bjanshee.ru
+blacktwhite.com
+bristolhotel.com
+buchananshardware.com
+bus-offer.com
+buybest1.biz
+buydissertation.net
 buzzzg.men
-calcularpagerank.com
-callcafe.info
-candy-glam-hp.com
-cashkitten-a.akamaihd.net
-catalogs-parts.com
-ccjp.eu
-cctva.tv
-cdncash.net
+bytimedance.ru
+cacheimages.com
+callawaygolfoutlet.online
+callmd5map.com
+calstaterealty.us
+cdn.walkme.com
 celejihad.info
-ceotrk.com
-checktext.org
-citetick.com
-cjmc.info
-claytransformations.info
-clippingphotoindia.com
+c-english.ru
+cheap-trusted-backlinks.com
+cherrypointplace.ca
+chiblackhawks-jerseys.com
+children-learningreading.info
+chinese-amezon.com
+choosecuisine.com
+chorus.terakeet.com
+christianlouboutinsaleoutletonline.us
+cialgenisrx.com
+cialisovercounteratwalmartusa.com
+classicakuhni.ru
+cleanpcnow.com
+clicksor.com
+clicksor.net
+clickzzs.nl
 coindirect.io
-companies-catalog.com
-compliance-alexa.top
-compliance-donald.xyz
-connectingsingles.com
-cookie-law-enforcement-ff.xyz
-copenergo.ru
-copypaste.traderzplanet.in
-cougfan.info
-countercrazy.com
-covetnica.com
-crackguru.tk
-customcatchcan.com
-darkages.info
+compliance-don.xyz
+compliance-margo.top
+compliance-walt.top
+continent-e.tv
+cookingmeat.ru
+cool-wedding.net
+copro.pw
+crynet.cc
+customchocolate.business-for-home.com
+daisye.top
 dawlenie.com
-deda-moroza-zakaz.ru
-deniven.1bb.ru
-dev78.dioniqlabb.se
-dildofotzen.net
-dnepropetrovsk.mistr-x.org
-dneprsvet.com.ua
-documentsite.net
-dokfilms.net
+ddlmega.net
+delayreferat.ru
+den-noch24.ru
+detalizaciya-tut.biz
+dev33.dioniqlabb.se
+dev.citetick.com
+dev-seo.blog
+digest-project.ru
+directrev.com
+dirtpics.pw
+diusyawiga.tk
 domaineaneblanc.com
-domain-submit.info
-domashneeruporno.com
-dorratex.tn
-download-wallpaper.net
-dpihatinh.gov.vn
-dyshagi.ru
-e2click.com
-eachdayisagift.review
-easync.io
-e-biznes.info
-ebooknovel.club
-egvar.net
-ekosmetyki.net.pl
-ekspertmed.com
-e-kwiaciarz.pl
-elektir.ru
-elektrischezigarette1.blog.pl
-elektrischezigarettekaufen2.cowblog.fr
-elektronischezi.livejournal.com
-erectile.bid
-escortplius.com
-euronis-free.com
-europages.com.ru
-event-tracking.com
-executehosting.com
-exhibitionplus.eu
-extrabot.com
-extremez.net
-ezigarettekaufen2.mpbloggar.se
-ezigarettenshop2.postbit.com
-ezigaretteshop.webs.com
-fanpagerobot.com
-fashion-stickers.ru
-fatmaelgarny.com
-favorcosmetics.com
+domik-derevne.ru
+domination.ml
+domznaniy.ru
+donna7753191.ru
+dood.live
+doska-vsem.ru
+doxysexy.com
+drivotracker.com
+duplicashapp.com
+dvd-famille.com
+dwomlink.info
+edge.sharethis.com
+electrik-avenue.com
+eleimgo.pw
+elitedollars.com
+elite-sex-finders.com
+emailaccountlogin.co
+empirepoker.com
+eropornosex.ru
+es5.com
+escortslet.net
+eu-cookie-law.info
+evidencecleanergold.com
+excitacion.info
+extads.net
+facebook-mobile.xyz
+fba-mexico.com
 fealq.com
-feeriaclub.ru
-fifa-coins.online
-filmgo.ru
-finuse.com
-fitfloponline.store
-fitnesspiks.com
-flavors.me
+feargames.ru
+fickblock18.com
+film-one.ru
+findpik.com
+firma-legion.ru
+flauntyoursite.com
+footballfarrago.com
+forex21.ru
+formulaantiuban.com
+fortwosmartcar.pw
 forum-engineering.ru
-free411games.com
+forums.toucharcade.com
+foto-basa.com
 free-fb-traffic.com
-freejabs.com
-freeseedsonline.com
-free-social-buttons.xyz
-freshsuperbloop.com
-funnymama.com
-gambarkatabaru.com
-gambarxkata.co
-gembird.com
-germes-trans.com
-getdot.ru
-getmiro.com
-getridofstretchmarks.org
-gfaq.ru
-globalsurfari.com
-go2jump.org
-goforexvps.com
-gogps.me
-goldandcard.ru
-goldpanningtools.com
-gomusix.com
-googglet.com
-gosmeb.ru
-gsmtlf.ru
-g.starmoe.xyz
-gta-club.ru
-guarrasdelporno.xxx
-hatdc.org
-haveinc.xyz
-hdhc.ru
-headpress.ru
-healing-dysplasia.ru
-heartofpayne.xyz
-heliko.no
+free-laptop-reward.com
+freenode.info
+free-traffic.xyz
+freewebs.com
+fugarif.ga
+gambarkataku.co
+gamebackyard.com
+gameprimary.com
+gay-site.store
+ge0ip.org
+geile-lelly.eu
+get-free-traffic-now.com
+getlaid-xxxhookupdirect.com
+getmyads24.com
+ghazel.ru
+glass-msk.ru
+glcomputers.ru
+global-ics.co.za
+go2album.com
+gojiberriess.apishops.ru
+gotwebsite1.com
+gov.yanao.ru
+gratis-sexkontakte.com
+gtopstats.com
+guardlink.com
+harmonyglen.us
+hazardky.net
+healmytrauma.info
+helvetia.com.ua
 hermesreplica.pw
-himazin.info
-homegardenlova.com
-homelygarden.com
-home.myplaycity.com
-honyaku.yahoofs.jp
-humanelydrew.com
-iamsport.org
-ideoworld.org
-id-forex.com
-igtools.club
-ikritikimou.gr
-iloveitaly.ru
-images-graphics-pics.com
-i-midias.net.br
-imk.com.ua
-inbabes.sexushost.com
-indiasourcemart.in
-infobabki.ru
-informatiecentro.be
-insurple.com
-integritylandscapeservices.com
+holidaypics.org
+homedecoguide.info
+hostcritique.com
+hosting-tracker.com
+host-protection.com
+hotenergy.ru
+hulfingtonpost.com
+hunthillfarmtrust.org
+hybrid.ru
+imabase.com
+imgarcade.com
+imitex-plus.ru
+impresagaia.it
+infostatsvc.com
+inmate-locator.us
+insider.pro
+insomniagamingfestival.com
+interferencer.ru
+interfucks.net
+iqoption-bin.com
 isitpaleo.info
-ispaniya-costa-blanca.ru
-itis4you.com
-ixora.pro
-janerikholst.se
-jyvopys.com
-kaidalibor.de
-kakadu-interior.com.ua
-kandidos.com
-kareliatobacco.ru
-katushka.net
-kerwinandcariza.com
-keywesthideaways.co
-keywordsking.com
-kihi.gdn
-kiinomaniak.pl
-kinohall.ru
-kinohit1.ru
-klejonka.info
-klumba55.ru
-knowsitall.info
-konica.kz
-konkursov.net
-labafydjxa.su
-lawyers.cafe
-letolove.ru
-letto.by
-libertybilisim.com
-likrot.com
-linkdebrideur.xyz
-linkpulse.com
-lkbennettstore.online
-locustdesign.co
-lombia.com
-lostfilm-online.ru
-lsex.xyz
-ltvperf.com
-machicon-akihabara.info
-macotool.com
-mafa-free.com
-mailemedicinals.com
-marcowebonyodziezowe.pl
-masthopehomes.com
-max-p.men
-mebelcomplekt.ru
+iskalko.ru
+iwantedmoney.com
+james13prix.info
+janettabridal.com
+javstock.com
+jav-way.site
+jerseyssportsshop.com
+jimmychoosale.online
+jongose.ninja
+junglenet-a.akamaihd.net
+justkillingti.me
+kaac.ru
+kakablog.net
+kalandranis.gr
+kamalsinha.com
+kerch.site
+keywordblocks.com
+kino-fun.ru
+kinopolet.net
+kladrus.ru
+kliksaya.com
+kreativperlen.ch
+kvartir-remont.biz
+laexotic.com
+lampokrat.ws
+lankarns.com
+lashstudia.ru
+link.ac
+littlecity.ch
+live-cam6.info
+lombardfinder.ru
+lomb.co
+lookingglassemb.com
+lutherstable.org
+lyrster.com
+m0r0zk0-krava.ru
+macdamaged.space
+macdamaged.tech
+mackeeper-center.club
+magicdiet.gq
+mall.uk
+markjaybeefractal.com
+marmitaco.cat
+matb3aa.com
+matrixalchemy.com
+mcar.in.ua
+meddesk.ru
+medmajor.ru
 meendo-free-traffic.ga
-megaapteka.ru
-megaindex.ru
-memberty.com
-mere.host.sk
-metascephe.com
+mega-bony-2017.pl
+mejoresfotos.eu
 michaelkorsoutlet.store
-middlerush-a.akamaihd.net
-milblueprint.com
+microsearch.ru
+mikrobiologies.ru
 minecraft-rus.org
-mobot.site
-modabutik.ru
-mosrif.ru
-moz.com
-mrvideospornogratis.xxx
-mttwtrack.com
-mulberryoutletonlineeu.com
-multgo.ru
-music7s.me
-muztops.ru
-mycouponizemac.com
-mydoctorok.ru
-myseoconsultant.com
-mywallpaper.top
-navalwiki.info
-new-apps.ru
-newsperuse.com
-news-readers.ru
-newtechspb.ru
-nicovideo.jp
-nightvision746.weebly.com
-no-fuel.org
-nonews.co
-nordstar.pro
-nowtorrents.com
-nrjmobile.fr
-oballergiya.ru
-omoikiri-japan.ru
+mini.7zap.com
+moje-recenze.cz
+monclerjacketsoutlet.pw
+moxo.com
+msfsaar.de
+musicspire.online
+muycerdas.xxx
+mygameplus.com
+myiptest.com
+nac-bearings.ru
+natali-forex.com
+naturalbreakthroughsresearch.com
+neodownload.webcam
+net-profits.xyz
+next-dentists.tk
+nibbler.silktide.com
+ningessaybe.me
+nofreezingmac.work
+nottyu.xyz
+noumeda.com
+nrv.co.za
+nucia.biz.ly
+nullrefer.com
+nzfilecloud.weebly.com
+offergroup.info
+of-ireland.info
+okonich.com.ua
+okout.ru
+okuos.com
+onclkads.com
+online247.ml
 onlineporno.site
-online-templatestore.com
-online-x.ru
-onlyforemont.ru
-optitrade24.com
-outshop.ru
-oxotl.com
-paleohub.info
-paphoselectricianandplumber.com
-pathwhelp.org
-pcboa.se
-pdn-4.com
-penisvergrotendepillennl.ovh
-perl.dp.ua
-petrovka-online.com
-photostudiolightings.com
-phuketscreen.com
-pijoto.net
+o-o-11-o-o.com
+openlibrary.org
+openmediasoft.com
+opinionreelle.com
+orenburg-gsm.ru
+orgasmatrix.com
+orion-code-access.net
+ororodnik.goodbb.ru
+outpersonals.com
+pacificair.com
+partner-high.men
+partners-ship.pro
+partnerworkroom.men
+pawli.eu
+pdamods.ru
+pechikamini.ru
+pensplan4u.com
+phormchina.com
+picturesfrom.com
+picturesify.com
+pills24h.com
 piluli.info
-pixelrz.com
-pizza-imperia.com
-play-mp3.com
-pliks.pl
-poem-paying.gq
-popugauka.ru
-popunder.net
-porno-dojki.net
-pornophoto.xyz
-pp-budpostach.com.ua
-praisong.net
-preparevideosafesystem4unow.space
+pipki.r.acdnpro.com
+pixell.club
+pkr1hand.com
+play.leadzupc.com
+playlott.com
+plohaya-kreditnaya-istoriya.ru
+poems.com.ua
+porndroids.com
+pornobrazzers.biz
+pornogad.com
+pornowarp.info
+pornstartits.xblog.in
+pravoholding.ru
+prefersurvey.net
+preparevideosafesystem4unow.site
 prlog.ru
-prodess.ru
-promodj.com
 promoforum.ru
-psa48.ru
-py100.ru
-queerspace.com
-randki-sex.com
-rapevideosmovies.com
-registry-clean-up.net
-reimageplus.com
-remmling.de
-remont-fridge-tv.ru
-renecaovillasale.online
-rennlist.com
-rixpix.ru
-rock-cafe.info
-rumamba.com
-ruspdd.com
-safe-app.net
-saneyes.com
-santasgift.ml
-saratov.xrus.org
-savememoney.co.za
-sax-sex.com
-scansafe.net
-security60-e.com
-seemoreresultshu-a.akamaihd.net
-selectads.men
-semaltmedia.com
-semprofile.com
-seoholding.com
-seojokes.net
-sergiorossistore.online
-sevendays.com.ua
-shama-rc.net
-sharebutton.org
-shlyahten.ru
-shmetall.com.ua
-sibtest.ru
-silverage.ru
-simplepooltips.com
-sitevaluation.org
+proprostatit.com
+prostitutki-kiev.org
+pssucai.info
+pukaporn.com
+puzo2arbuza.ru
+qor360.com
+quick-offer.com
+quick-seeker.com
+rabot.host.sk
+raschtextil.com.ua
+rasteniya-vs-zombi.ru
+r-e-f-e-r-e-r.com
+registry-cleaner.net
+registrysweeper.com
+remont-komputerov-notebook.ru
+remont-mobile-phones.ru
+repeatlogo.co.uk
+resant.ru
+restaurantlescampi.com
+reversing.cc
+ribieiendom.no
+ric.info
+robertefuller.com
+roma-kukareku.livejournal.com
+rospromtest.ru
+runofilms.ru
+rutor.vip
+sabaapress.com
+salut-camp.ru
+samolet.fr
+sarm.tk
+savingsslider-a.akamaihd.net
+sbdl.no
+searchtooknow-a.akamaihd.net
+secretscook.ru
+seokicks.de
+seorussian.ru
+sethrollins.net
+sevenstars7.com
+se-welding.ru
+sexkontakte-seite.com
+sexphoto.site
+sexsaoy.com
+sexs-foto.top
+sexspornotub.com
+sexy.babes.frontend-stack.top
+sexyteens.hol.es
+sharebutton.to
+signal03.ru
+silvercash.com
+simple-image.com.ua
+simply.net
+sinel.info
+sirpornogratis.xxx
+sisi-go.ru
 skanninge.se
-skincrate.net
-skylta.com
-slim.sellany.ru
-slonechka.ru
-sluganarodu.ru
-smart-balancewheel.com
-snip.tw
-soda.media
-solitaire-game.ru
-souvenir.cc
-sovetogorod.ru
-space2019.top
-spaceshipad.com
-spb-plitka.ru
-sportbetfair.com
-sprttrack.com
-sptslmtrafms.com
-squidoo.com
-starwars.wikia.com
-steelmaster.lv
-stefanbakosab.se
+skatestick.bid
+sk.golden-praga.ru
+snjatie-geroinovoy-lomki.ru
+social-buttons.xyz
+social-s-ggg.xyz
+soserfis.com
+soundfrost.org
+space-worry.ml
+spitfiremusic.com
+spywarenuker.com
+staticfs.host
+statistici.ro
+stats-public.grammarly.io
+stevemonsen.com
 stmassage.ru
-strana-krasoty.ru
-streetfire.net
-strongsignal-a.akamaihd.net
-students-cheapskate.ml
-sudexpert66.ru
+stpicks.com
+studiofmp.com
+superlist.biz
 supernew.org
-surcentro.com
-svolze.com
-tampabaywatch.org
-telefonsexi.com
-thin.me.pn
-ticketsys.inetwd.com
-tizanidine4mg.blogspot.com
-tizanidineandgabapentin.blogspot.com
-tizanidinenarcotic.blogspot.com
-tizanidineoral.blogspot.com
-tizanidinesideeffectsweightloss.blogspot.com
-tizanidinestreetvalue.blogspot.com
+surffoundation.nl
+swiped.su
+td-l-market.ru
+tds-advert002.info
+teastory.co
+tedy.su
+telefonsexsofort.tk
+tengohydar.tk
+thegameriders.com
+thetardistimes.ovh
+thruport.com
+timecrimea.ru
+titelhelden.eu
+tizanidinedruginteractions.blogspot.com
+tizanidinehcl4mgtabinfo.blogspot.com
+tizanidinepain.blogspot.com
+tizanidinerecreationaluse.blogspot.com
 tjkckpytpnje.com
-tmtrck.com
-topquality.cf
-trafficreceiver.club
-trustedhealthtips.com
-tuckermktg.com
+tn811.us
+topappspro.com
+topcar-krasnodar.ru
+torontoplumbinggroup.com
+tpu.ru
+tracfone.com
+tracksz.co
+tradgardspartner.se
+traffpartners.com
+trk-4.net
+truck-addzilla.life
+trucri.me
+ttsq.fr
 turist-strani.ru
-tversvet.ru
-tvnewsclips.info
-tvoystartup.ru
-twinderbella.com
-u-cheats.ru
-univerfiles.com
-uptimebot.net
-urccvfmc.bloger.index.hr
-urzedowski.eu
-uvozdeckych.info
-validdomain.xyz
-varbergsvind.se
-vbabule.net
-v-doc.co
-vegan-foods.us
-vegascosmetics.ru
-ventelnos.com
-video-chat.love
-videochaty.ru
-videooko.weebly.com
+tx41tclega.ru
+tzritel.tk
+ugguk.online
+uhod-za-sobakoj.ru
+underthesite.com
+unlimitdocs.net
+uogonline.com
+usswrite.com
+valsalud.com
+vasileostrovsky-rayon.ru
+vertaform.com
+verymes.xyz
+viagra.pp.ua
+vip2ch.com
+visa-china.ru
+vita.com.hr
+viteonlusarezzo.it
 vkak.ru
-voloomoney.com
-voloo.ru
-voprosotvet24.ru
-vote-up.ru
-vsexkontakte.net
-wanker.us
-watchdogs-2.ru
-watch-movies.ru
-watchmygf.net
-we-are-gamers.com
-webenlace.com.ar
-whengirlsgowild.com
-wholesalejerseyscheapjerseys.us.com
-wholinkstome.com
-wieseversa.no
-winner7777.net
-winx-play.ru
-womensterritory.ru
-worldhistory.biz
-worldinternetauthority.com
-wormix-cheats.ru
-wsgames.ru
-x-diesel.org
-xingzi-vision.com
-xn-----6kcaacnblni5c5bicdpcmficy.xn--p1ai
-xn--80ak6aa92e.com
-xn----btbdvdh4aafrfciljm6k.xn--p1ai
-xn----ctbigni3aj4h.xn--p1ai
-xn--lifehacer-1rb.com
-xtube.com
-xxx-treker.ru
-yellowads.men
-yellowfootprints.com
-yoluxuryevents.com
-youporn-ru.com
-yourporngay.com
-ytmnd.com
-yunque.pluto.ro
-yurgorod.ru
+voltrknc1.com
+w3data.co
+w7s.ru
+wapsite.me
+watchmyfb.pl
+website-speed-up.top
+wemedinc.com
+wesharepics.info
+while.cheapwebsitehoster.com
+wineration.com
+winterclassichockeyjerseys.com
+woman-tampon.ru
+wordpress-crew.net
+works.if.ua
+worldmusicfests.com
+xitjw.info
+x-lime.com
+x-mix.info
+xn----7sbbagbq7bd5aheftfllo4m.xn--p1ai
+xn--80aeahghtf8ac5i.xn--p1ai
+xn----8sblgmbj1a1bk8l.xn----161-4vemb6cjl7anbaea3afninj.xn--p1ai
+xn--d1abj0abs9d.in.ua
+xportvusbdriver8i.snack.ws
+xrus.org
+xsion.net
+xtrafficplus.com
+x-true.info
+xzlive.com
+yadro.ru
+yginekologa.com
+youbloodyripper.com
+yougotanewdomain.com
+yourads.website
+yuarra.pluto.ro
 zaimhelp.ru
-zakonobosago.ru
-zastenchivosti.net
-zeroredirect12.com
-zeroredirect9.com
-znakomstva-moskva77.ru
-zoominfo.com
-zscalerone.net
+zeroredirect10.com
+zigarettenonlinekaufen2.bloog.pl
+zigarettenonlinekaufen.tumblr.com
+zone-kev717.info
+zoodrawings.com
 zynax.ua
diff --git a/.dev-tools/test_units/random-referrers-for-whitelist-test.list b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
index bfb04da26..13289c3fa 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 @@
-123movies.love
-13tabs.com
-1webmaster.ml
-2ads.co.uk
-4webmasters.org
-51unlim.ru
-7zap.com
-abiente.ru
-absugars.com
-admeasures.com
-adultfriendfinder.com
-adultfullhd.com
-all4invest.ru
-allknow.info
-amateurgalls.com
-apiwebwebgetcom-a.akamaihd.net
-apparel-offer.com
-arcteryxsale.online
-arquapetrarca.info
-atelielembrancaqueencanta.com.br
-audiofree.ru
-autoseo-traffic.com
-axbocz.net
-babespcs.com
-babosas.com
-balkanfarma.ru
-betteroffers.review
-betterscooter.com
-bizfly.info
-bizlist.com.de
-bochemit.com.ua
-bookmaker-bet.com
-brewdom.ru
+007angels.com
+100dollars-seo.com
+1millionusd.xyz
+4kepics.com
+4pp13.com
+7a2rnuey1tw9ar.ru
+8jn.dating-app.ru
+a14download.com
+adtech.fr
+advertisingtag.net
+aimayangzhi.com
+akama.com
+aliexpresscashback.club
+anime.dougasouko.com
+anlimebel.kiev.ua
+anmysite.com
+apisecretsaucebi-a.akamaihd.net
+appfixing.space
+astana.xxxkaz.org
+auto.rusvile.lt
+autoua.top
+autowebmarket.com.ua
+availit.weebly.com
+avtoarenda.by
+beauty-things.com
+berlininsl.com
+best-games.today
+besthoro.ru
+bestofpicture.com
+bget.ru
+biketank.ga
+blobar.org
+bookmark4you.com
+boole.onlinewebshop.net
 brg8.com
-cactussoft.biz
+bupropion-sr-150-mg.us
+buyantiviralwp.com
 callmd5map.com
-carson.getenjoyment.net
-caveavins.fr
+canyougethighofftizanidine.blogspot.com
+carapics.com
+cartierreplica.top
+cbcseward.com
 celebsopics.com
-chiblackhawks-jerseys.com
-cialiswithoutadoctor.net
-community.allhiphop.com
-compliance-andrew.top
-compliance-checker-7.info
-compliance-willy.top
-customcatchcan.com
-danceuniverse.ru
+chelnytruck.ru
+cleanersoft.com
+clodo.ru
+com-cleaner.systems
+compliance-don.top
+compliance-john.top
+crackzplanet.com
+creditwell.ru
+custodieva.ru
+customerguru.in
+cutalltheshit.com
+daneshetabiat.com
 darkages.info
-dealwifi.com
-defenderxtactical.com
-dickssportinggoods.com
+deanmoore.ie
 digilander.libero.it
-divisioncore.com
-dmmspy.com
-dokumentalkino.net
-drunkenstepfather.com
-e2click.com
-editors.choice6912650.hulfingtonpost.com
-ege-russian.ru
-elitesportsadvisor.com
-emailaccountlogin.co
-en.altezza.travel
-erot.co
-eshop.md
-event-tracking.com
-everytalk.tv
-exchanges-bet.com
-excitacao.com
-eyessurgery.ru
-ezigarettenshop2.myblog.de
-favorcosmetics.com
+div.as
+domain-tracker.com
+dvd-famille.com
+e-commerce-seo1.com
+electricwheelchairsarea.com
+elvel.com.ua
+extlabs.io
+eyelike.com.ua
+facebook-mobile.xyz
 feel-planet.com
-filefilter.weebly.com
-filmetricsasia.com
-f-loaded.de
-floating-share-buttons.com
-fotzen-ficken.com
-franklinfire.co
-frbizlist.com
-free-fb-traffic.com
-freshdz.com
-freshwallpapers.info
-futbolkisales.ru
-gallerylisting.com
-gaz-voshod.ru
-gnuetella.com
-good-mummy.ru
-gowreckdiving.com
+ff30236ddef1465f88547e760973d70a.com
+fickkontakte.org
+filesmonster.porn
+firesub.pl
+fitness-video.net
+floridahuntingfishingadventures.com
+floridamobilebillboards.com
+forex.osobye.ru
+forpostlock.ru
+fotopop.club
+frequiry.com
+freshmac.space
+frivgame250.com
+fun2cell.net
+fun-mobi.pl
+galaxys6manual.info
+ghostvisitor.com
+globatur.ru
+goldenggames.com
+goodprotein.ru
 gsasearchengineranker.top
-guarrasdelporno.xxx
-gyffu.com
-hamacapty.com
-handicapvantoday.com
-hawaiisurf.com
-hdseriale.pl
-hermesbracelets.xyz
-hothot.ru
-iccornacircri.cf
-id-forex.com
-inet-traffic.com
-infowarcraft.ru
-inspiring-desperate.tk
-insurple.com
-iptool.xyz
-iradiology.ru
-jerseywholesalechinabiz.com
-jolic2.com
-kamorel.com
-kashubadesign.ru
-keenoutlet.online
-kerei.ru
-kerwinandcariza.com
-keyhantercume.com
-keywordsdoctor.com
-kinocccp.net
-kino-rating.ru
-kiprinform.com
-kongruan.com
-konpax.com
-lanadelreyfans.us
-life-instyle.com
-lifeinsurancekb.com
-lightinghomes.net
-linkbux.ru
-lirunet.ru
-lisque.batcave.net
-mackeeper-land-672695126.us-east-1.elb.amazonaws.com
-magda-gadalka.ru
-magento-crew.net
-mail.allnews24.in
-mamasuper.prom.ua
-masterseek.com
-meds-online24.com
-mobile-appster.ru
-mobot.site
-money-for-placing-articles.com
-muschisexbilder.com
-musezone.su
-musicdaddy.net
+gwebtools.com
+hacktougroup.ru
+helvetia.com.ua
+hosting-tracker.com
+howopen.ru
+husky-shop.cz
+ideibiznesa2015.ru
+ilmexico.com
+incep.imagine-ex.co
+invitefashion.com
+isotoner.com
+istizanidineanarcoticdrug.blogspot.com
+iyasimasennka.com
+janavibekken.no
+jerseywholesalebizchina.com
+justdating.online
+kamalsinha.com
+karpun-iris.ru
+keywordhouse.com
+kihi.gdn
+kinomaniatv.pl
+kit-opt.ru
+kleine-titten.biz
+knogg.net
+knowsitall.info
+kumuk.info
+kupit-adenu.ru
+kustanay.kz
+laapp.com
+landoftracking.com
+larger.io
+lawyers.cafe
+linkarena.com
+livejasmin.com
+locustdesign.co
+magicalfind-a.akamaihd.net
+mansparskats.com
+mantramusic.ru
+max-p.men
+mebelcomplekt.ru
+meet-flirt-dating.com
+minecraft-neo.ru
+mmog-play.ru
+msk.afora.ru
 musicktab.com
-muztops.ru
-myshopmatemac.com
-mystats.xyz
-narutonaruto.ru
-newhairstylesformen2014.com
-newstraveller.ru
-nfljerseyscheapchinabiz.com
-nippon-bearings.ru
-orion-code-access.net
-orion-v.com
-partnerline.men
-picscout.com
-picturesboss.com
-piski.top
-pl.id-forex.com
-poem-paying.gq
-pornokajf.com
-porno-transsexuals.ru
-portadd.men
-pourvous.info
-primedice.com
-privatov-zapisi.ru
-promodj.com
-promoforum.ru
-proposal-engine.com
-prostitutki-tyumeni.org
-rangjued.com
-r-control.ru
-realitykings.com
+mywallpaper.top
+nalogovyykodeks.ru
+narco24.me
+narkologiya-belgorod.ru
+narkologiya-penza.ru
+nibbler.silktide.com
+ningessaybe.me
+offtime.ru
+optom-deshevo.ru
+osb.se11.ru
+pacificair.com
+panamaforbeginners.com
+patterntrader-en.com
+pc-services.ru
+peekyou.com
+playlott.com
+polcin.de
+popserve.adscpm.net
+portal-eu.ru
+porto.abuilder.net
+portside.xyz
+pozvonim.com
+prefersurvey.net
+privatamateure.com
+professionalwritingservices15.blogspot.ru
+profitwithalex.info
+prostitutki-astana.org
+proxyelite.biz
+purchasepillsnorx.com
+q-moto.ru
+questionmarque.ch
+quizzitch.net
+randalljhoward.com
 realnye-otzyvy.info
-redirect.trafficreceiver.club
-rentehno.ru
+rebuildermedical.com
+relayblog.com
+remont-ustanovka-tehniki.ru
+remote-dba.de
 responsinator.com
-safe-app.net
-salutmontreal.com
-saratov.xrus.org
-scanner-ivan.top
+rfserial.net
+royal-betting.net
+ruscopybook.com
+sarf3omlat.com
+scanner-donald.top
+scanner-walter.top
+scmor.ilxc.cc
+score-ads.men
+scripted.com
 seinterface.com
-semrush.com
-senger.atspace.co.uk
-seokicks.de
-seo-tools-optimizing.com
-serialsway.ucoz.ru
-servisural.ru
-sevenstars7.com
-sex-foto.pw
-sex-pr.net
-shopwme.ru
-simplepooltips.com
-smadihome.com
-smallseotools.com
+selectads.men
+sexad.net
+sexyali.com
+shlyahten.ru
+sientalyric.co
+site-auditor.online
+site.ru
+site-speed-check.site
+slomm.ru
+smsactivator.ru
 socialmonkee.com
-solinf.co
-sotkal.lark.ru
-speedup-my.site
-stard.shop
-statoutlook.info
-staynplay.net
-stefanbakosab.se
-stpolice.com
-tattomedia.com
-templates.franklinfire.co
-tizanidinedrugtest.blogspot.com
-tizanidineoral.blogspot.com
-tjkckpytpnje.com
-tmearegion26.com
-tootoo.to
-trahvid.com
-trudogolik.net
-ttsq.fr
-tzritel.tk
-uggbootsoutletsale.us
-uk-zheu20.ru
-unrealcommander.biz
-ventelnos.com
-vereo.eu
-videtubs.pl
-vigrx-original.ru
-viktoria-center.ru
-vipsiterip.org
-vita.com.hr
-vkak.ru
-vkgaleria.com
-vkmusics.ru
-vkontaktemusic.ru
-voditeltrezviy.ru
-vsexkontakte.net
-webshoppermac.com
-while.cheapwebsitehoster.com
-wholesalecheapjerseysfree.com
-whos.amung.us
-whosonmyserver.com
-wikes.20fr.com
-woman-h.ru
-worldoffiles.ru
-wormix-cheats.ru
-xclicks.net
-x-diesel.biz
-xn-----6kcaabbafhu7cskl7akvongwpo7hvjj.xn--p1ai
-xn--c1acygb.xn--p1ai
-xportvusbdriver8i.snack.ws
-xxxtubesafari.com
-yellowads.men
-ytmnd.com
-yugo-star.ru
-yunque.pluto.ro
-zapiszto.pl
-zarabotat-na-sajte.ru
-zhuravlev.info
-zscaler.net
+softwaretrend.net
+solmarket.by
+songoo.wz.cz
+sovetogorod.ru
+space2019.top
+sport-video-obzor.ru
+stal-rulon.ru
+startwp.org
+stats-public.grammarly.io
+stretchmate.net
+studiofaca.com
+sugarkun.com
+surffoundation.nl
+svarbit.com
+thelottosecrets.com
+tizanidineandhydrocodone.blogspot.com
+tongkatmadura.info
+torrent-newgames.com
+traffic100.com
+traffique.net
+triumf-realty.ru
+tyumen.xrus.org
+ugguk.online
+unblocksit.es
+vacances-voyages.info
+vekzdorov.ru
+videochaty.ru
+villakohlanta.nu
+vinsit.ru
+watchdogs-2.ru
+web.cvut.cz
+website-audit.com.ua
+whipme.yopoint.in
+wleuaprpxuvr.ga
+wma-x.com
+wordpresscore.com
+wrona.it
+wsgames.ru
+www.timer4web.com
+xbaboon.com
+x-musics.com
+xn----7sbifcamovvfggw9d.xn--p1ai
+xn----8sblgmbj1a1bk8l.xn----161-4vemb6cjl7anbaea3afninj.xn--p1ai
+xn----9sbebi2bvzr7h.xn--p1ai
+xn--h1ahbi.com.ua
+xnxxandxvideos.com
+xtrafficplus.com
+yaaknaa.info
+youtuhe.com
+zajm-pod-zalog-nedvizhimosti.ru
+zdesoboi.com
+zetgie.com.pl
+znakom.sibtest.ru
+znakomstva-moskva77.ru
+zoompegs.com
+zverokruh-shop.cz
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index f371d9e5f..a7215fb74 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,21 +1,11 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to NginX</title>
-</head>
-<body>
-<div align=center>
-<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
-<p>This is merely used for testing !!!</p>
-</body>
-</html><html>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.14.2</center>
 </body>
 </html>
-<html>
+l>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -126,4 +116,14 @@
 <h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
 <p>This is merely used for testing !!!</p>
 </body>
+</html><!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
 </html>
\ No newline at end of file
diff --git a/.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 500584a94..bc389ee32 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.224.112.202	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 d73aa6b0f..adc25298e 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 1250a549a..a500abb1d 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 292aab17d..27cfc4e77 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1722
+#### Version: V4.2019.07.1723
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index e07e739b9..767f89c09 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1722
+#### Version: V4.2019.07.1723
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index a5a0cf0bc..206d38e4b 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.1722
+#### Version: V4.2019.07.1723
 #### Bad Referrer Count: [6717](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad Bot Count: [556](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 ____________________
diff --git a/_google_analytics_ghost_spam/README.md b/_google_analytics_ghost_spam/README.md
index 42997536f..6637a1654 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.1722
+#### Version: V4.2019.07.1723
 #### 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 87948b6b1..f67b80616 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.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 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 e57725ac9..0ea01be7d 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.1722
-### Updated: Mon Jul  1 15:22:53 SAST 2019
+### Version: V3.2019.07.1723
+### Updated: Mon Jul  1 15:51:53 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index 87948b6b1..f67b80616 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1722
-### Updated: Mon Jul  1 15:22:52 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:51 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index 6eee58836..16fbe73c8 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1722
-### Updated: Mon Jul  1 15:22:55 SAST 2019
+### Version: V4.2019.07.1723
+### Updated: Mon Jul  1 15:51:54 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##