diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index 4f5b6eb6d..f75458664 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.1738
-### Updated: Tue Jul  2 15:04:37 SAST 2019
+### Version: V3.2019.07.1739
+### Updated: Tue Jul  2 15:28:18 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
index 12f18b91b..42c86bb7d 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	1;
+35.193.7.13	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index c3c284efc..e42e64139 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	0;
+35.193.7.13	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 4f5b6eb6d..f75458664 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.1738
-### Updated: Tue Jul  2 15:04:37 SAST 2019
+### Version: V3.2019.07.1739
+### Updated: Tue Jul  2 15:28:18 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
index 12f18b91b..42c86bb7d 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	1;
+35.193.7.13	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index c3c284efc..e42e64139 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	0;
+35.193.7.13	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 4f5b6eb6d..f75458664 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.1738
-### Updated: Tue Jul  2 15:04:37 SAST 2019
+### Version: V3.2019.07.1739
+### Updated: Tue Jul  2 15:28:18 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
index 12f18b91b..42c86bb7d 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	1;
+35.193.7.13	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
index c3c284efc..e42e64139 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	0;
+35.193.7.13	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 4f5b6eb6d..f75458664 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.1738
-### Updated: Tue Jul  2 15:04:37 SAST 2019
+### Version: V3.2019.07.1739
+### Updated: Tue Jul  2 15:28:18 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 4f5b6eb6d..f75458664 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1738
-### Updated: Tue Jul  2 15:04:37 SAST 2019
+### Version: V3.2019.07.1739
+### Updated: Tue Jul  2 15:28:18 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index 9d51c4794..611de4c80 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 896ffe576..609536562 100644
--- a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +45,4 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-104.154.120.187         0;
+35.193.7.13             0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index 9d51c4794..611de4c80 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 5e7c0ed8e..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.184.226.236	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 3e60bde86..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.184.226.236	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 9d51c4794..611de4c80 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 5e7c0ed8e..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.184.226.236	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 3e60bde86..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.184.226.236	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 9d51c4794..611de4c80 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 5e7c0ed8e..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.184.226.236	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 3e60bde86..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.184.226.236	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 9d51c4794..611de4c80 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 7630320fb..2b16326a1 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.192.85.2             0;
-35.188.1.99             0;
+35.184.226.236          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 16b8f9342..489777f4f 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 d0c9a7cc9..53927f4a2 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.202.145.110          0;
+35.188.1.99             0;
 35.193.7.13             0;
+35.202.145.110          0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index 9d51c4794..611de4c80 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 57b281722..e3688dbe0 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.188.1.99             0;
-35.184.226.236          0;
+35.184.96.71            0;
 35.202.145.110          0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index 9d51c4794..611de4c80 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 12f18b91b..42c86bb7d 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	1;
+35.193.7.13	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 7fb87d010..90d3851bf 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 @@
-Flunky
-Humanlinks
-IDBot
-Mail.RU_Bot
-Panscient
-Screaming
-Sqworm
-Wallpapers/3.0
-WebsiteQuester
-x09Mozilla
+Acunetix
+AhrefsBot
+Bandit
+internetVista monitor
+Iskanie
+Keyword Density
+SalesIntelligent
+Siphon
+Vacuum
+WWWOFFLE
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index d870f809e..1ce6929d3 100644
--- a/.dev-tools/test_units/random-bots-for-test.list
+++ b/.dev-tools/test_units/random-bots-for-test.list
@@ -1,250 +1,250 @@
 360Spider
-404checker
 404enemy
-80legs
 Aboundex
-Acunetix
-AhrefsBot
-Alexibot
-AlphaBot
+ADmantX
+AfD-Verbotsverfahren
+AIBOT
+Aipbot
 Anarchie
-archive.org_bot
+Apexoo
+Attach
 autoemailspider
-BackDoorBot
+backlink-check
+BacklinkCrawler
 BackWeb
 Badass
+Bandit
+Barkrowler
 BDCbot
-BetaBot
 Bigfoot
 Blackboard
-BlackWidow
-Blow
+BLEXBot
 Bolt
-Buddy
-BuiltBotTough
-BunnySlippers
+Brandwatch
 BuzzSumo
-CATExplorador
 CCBot
 Cegbfeieh
-CheTeam
-ChinaClaw
-Cloud mapping
+Chlooe
+Claritybot
 coccocbot-web
 Cogentbot
+cognitiveseo
 Collector
-com.plumanalytics
+Copier
+CopyRightCheck
 Copyscape
-Craftbot
-crawler4j
 crawler.feedback
+crawl.sogou.com
 CrazyWebCrawler
-Crescent
-CrunchBot
-Custo
 DBLBot
-Deusu
-Devil
-DIIbot
+demandbase-bot
+Digincore
+DigitalPebble
 Dirbuster
-Disco
+Discoverybot
 Dispatch
-DittoSpyder
-DomainAppender
+DnyzBot
+DomainCrawler
 DomainSigmaCrawler
-DSearch
-EasyDL
-Ecxi
+Dotbot
+Download Wonder
+Ebingbong
+ECCP/1.0
 EirGrabber
 EMail Siphon
+EroCrawler
+Evil
 Express WebPictures
-ExtLinksBot
 Extractor
-ExtractorPro
-Extreme Picture Finder
-Ezooms
 facebookscraper
-FemtosearchBot
-FHscan
 Firefox/7.0
-Freeuploader
-FrontPage
-FyberSpider
+Foobot
 GalaxyBot
-GermCrawler
+Gigablast
 Go-Ahead-Got-It
+Gotit
 GoZilla
 Go!Zilla
-Grabber
+GrabNet
 Grafula
 GrapeFX
-GrapeshotCrawler
 GridBot
-GT::WWW
+Harvest
+Havij
+HEADMasterSEO
+Heritrix
 Hloader
 HMView
-HTTP::Lite
-HTTrack
-HybridBot
 Iblog
-Image Fetch
-IndeedBot
+Id-search
+IlseBot
+Image Sucker
+Indy Library
 InfoNaviRobot
-InfoTekies
-Intelliseek
 InterGET
+Internet Ninja
 InternetSeer
+internetVista monitor
 ips-agent
-Iria
-JamesBOT
+Iskanie
+IstellaBot
 Jbrofuzz
-JennyBot
-JikeSpider
-Kozmosbot
+JetCar
+Joomla
+Kenjin Spider
 Lanshanbot
-Larbin
-LeechGet
 LexiBot
-Lftp
-Lightspeedsystems
+Libwhisker
+Likse
+Linkdexbot
+LinkpadBot
+LinkScan
 LinkWalker
-LinqiaMetadataDownloaderBot
 LinqiaScrapeBot
-Lipperhey Spider
+Ltx71
 LWP::Simple
+lwp-trivial
 Magnet
 Mag-Net
-Mail.RU_Bot
-Majestic12
-Majestic-SEO
 MarkMonitor
+MarkWatch
+Mata Hari
+MauiBot
 Meanpathbot
 MeanPath Bot
-Mediatoolkitbot
 MegaIndex.ru
 Metauri
-MIDown tool
+MFC_Tear_Sample
+MIIxpc
 MJ12bot
-Morfeus Fucking Scanner
-MSFrontPage
 MSIECrawler
 Msrabot
 MS Web Services Client Protocol
+muhstik-scan
+Musobot
 Name Intelligence
 Nameprotect
-Navroad
-Needle
-NetAnts
+NearSite
+Nessus
+Netcraft
 NetLyzer
-NetMechanic
 Net Vampire
-Netvibes
-NetZIP
-Nikto
+NICErsPRO
+Niki-bot
 NimbleCrawler
-Nimbostratus
+Nmap
+Nutch
 oBot
-Octopus
+Offline Navigator
+OnCrawl
 Openfind
-OpenLinkProfiler
 OpenVAS
-OrangeBot
-OrangeSpider
+OutclicksBot
+PageAnalyzer
+PageGrabber
 PageScorer
 Panscient
+Papa Foto
 Pavuk
 PECL::HTTP
 PHPCrawl
 Pimonster
-Pi-Monster
-Pixray
 POE-Component-Client-HTTP
+ProPowerBot
 ProWebWalker
+Psbot
 Pump
-RankActive
+PxBroker
 RankActiveLinkBot
-RankFlex
 RankingBot2
-RebelMouse
-Recorder
-RedesScrapy
+Rankivabot
 ReGet
-RocketCrawler
+RepoMonkey
+Ripper
 s1z.ru
-scan.lol
-Scrapy
-Screaming
+SBIder
 ScreenerBot
-Searchestate
-Semrush
-SemrushBot
+SearchmetricsBot
 SEOkicks
+SEOkicks-Robot
+SEOlyticsCrawler
+SEOprofiler
 seoscanners
 serpstatbot
 Siphon
-SiteExplorer
+Site Sucker
 SlySearch
-Snake
-SpaceBison
+SmartDownload
+SMTBot
+Snapbot
+Sogou web spider
 Spammen
 Spanner
 sp_auditbot
-Spbot
 Spinn3r
-SputnikBot
+spyfu
+Sqlmap
+Sqlworm
+Sqworm
+Stripper
+Sucker
 Sucuri
-SuperHTTP
-SurveyBot
-Suzuran
+Surfbot
+sysscan
 Szukacz
-tAkeOut
-Telesoft
+T0PHackTeam
+Teleport
+TeleportPro
 Telesphoreo
+Telesphorep
 The Intraformant
-Thumbor
+TheNomad
 TightTwatBot
 Titan
-Toata
-Tracemyfile
-Trendiction
-trendiction.com
+True_Robot
+Turnitin
 TwengaBot
-Twice
-Typhoeus
 Upflow
-URLy Warning
-VCI
-VoidEYE
+Vagabondo
+VB Project
+VidibleScraper
+Virusdie
+Voltron
+Wallpapers/3.0
+WallpapersHD
+WBSearchBot
 Webalta
 WebAuto
-Web Auto
-WebCollage
+Web Collage
 WEBDAV
-WebEnhancer
+Web Fetch
 Web Fuck
 WebGo IS
 WebImageCollector
-WebPix
-WebReaper
-Website Quester
+WebLeacher
+WebmasterWorldForumBot
+webmeup-crawler
+Web Pix
+Web Sauger
+Webshag
 Webster
-WebStripper
-WebZIP
-WeSEE
-Whack
-Whatweb
+WebSucker
+Web Sucker
+WebWhacker
+Whacker
 Who.is Bot
+Widow
+WinHTTrack
+WiseGuys Robot
 WISENutbot
 Wonderbot
 Wprecon
-WWW-Collector-E
-WWW-Mechanize
-Xaldon WebSpider
-Xaldon_WebSpider
-Xenu
-xpymep1.exe
+WPScan
+WWW::Mechanize
+x09Mozilla
 YoudaoBot
-Zade
 zauba.io
 zgrab
-ZumBot
+Zitebot
+ZmEu
+ZyBorg
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index 7570c4d18..e962afc49 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
+80legs
 Aboundex
 Acunetix
 ADmantX
-AfD-Verbotsverfahren
+AhrefsBot
+AiHitBot
 Alexibot
-BackDoorBot
+Alligator
+Asterias
 Backlink-Ceck
-BacklinkCrawler
-BackStreet
+backlink-check
 BackWeb
-Bandit
-BatchFTP
-Battleztar Bazinga
-Blackboard
-Blow
+Badass
+BDFetch
+Bigfoot
+Black Hole
+BLEXBot
 BlowFish
 Boardreader
 Bolt
-BotALot
-BuiltBotTough
+Buddy
 Bullseye
+BunnySlippers
 BuzzSumo
-Calculon
-CATExplorador
-CCBot
-Cegbfeieh
-CheeseBot
-CherryPicker
-Collector
-com.plumanalytics
-Copyscape
-Cosmos
-crawler4j
+ChinaClaw
+Cloud mapping
+coccocbot-web
+cognitiveseo
+Copier
+CopyRightCheck
+Craftbot
+crawler.feedback
 CrazyWebCrawler
+Crescent
+CrunchBot
 Curious
-demandbase-bot
-Demon
+DBLBot
 Devil
 Digincore
-Dirbuster
+DIIbot
 Disco
 Discobot
 Discoverybot
-Dispatch
-DittoSpyder
-DnyzBot
 DomainAppender
-DomainCrawler
 DomainSigmaCrawler
 DomainStatsBot
-Drip
-EasyDL
-Ebingbong
-EMail Wolf
-EroCrawler
-evc-batch
+eCatch
+Ecxi
+EirGrabber
+Evil
+Exabot
+Express WebPictures
 ExtLinksBot
-Extractor
-ExtractorPro
-Extreme Picture Finder
 EyeNetIE
-Ezooms
-facebookscraper
-FemtosearchBot
 FHscan
-Firefox/7.0
 FlashGet
-Freeuploader
-FyberSpider
-Fyrebot
-G-i-g-a-b-o-t
+GalaxyBot
+GermCrawler
+Getintent
+GetRight
 Go!Zilla
-Grafula
-Havij
-Hloader
-HTTrack
-Iblog
+GrabNet
+GrapeFX
+GT::WWW
+Heritrix
+HMView
+HTTP::Lite
+Humanlinks
+HybridBot
 IDBot
-Id-search
-Image Sucker
-IndeedBot
+IlseBot
+InfoNaviRobot
+instabid
 InterGET
+Internet Ninja
 internetVista monitor
 ips-agent
 IRLbot
-IstellaBot
-JamesBOT
+Iskanie
 JetCar
-Jetty
-Jorgee
-JustView
-Lanshanbot
-Larbin
-LeechFTP
-LeechGet
-LexiBot
-LibWeb
-Libwhisker
+Joomla
+Jyxobot
+Kenjin Spider
+Keyword Density
+Kozmosbot
+Lftp
+Lightspeedsystems
 Likse
-LinkpadBot
+LinkextractorPro
 LinksManager
-LinkWalker
-LinqiaMetadataDownloaderBot
 LinqiaRSSBot
 LinqiaScrapeBot
+Lipperhey Spider
 Litemage_walker
-LWP::Simple
 lwp-trivial
-magpie-crawler
-Majestic12
-Majestic SEO
+Magnet
 Majestic-SEO
+MarkMonitor
 MarkWatch
-Mass Downloader
+Masscan
+Mata Hari
 MauiBot
-Mediatoolkitbot
-mediawords
-MegaIndex.ru
-Microsoft Data Access
-MIIxpc
+Meanpathbot
+Metauri
+MFC_Tear_Sample
+Microsoft URL Control
+MIDown tool
 MJ12bot
+Mojeek
 Morfeus Fucking Scanner
-MSIECrawler
 muhstik-scan
 Musobot
-Name Intelligence
 Nameprotect
-Navroad
-NearSite
 Nessus
-Nettrack
+netEstate NE Crawler
+NetLyzer
+NetSpider
 Net Vampire
-NICErsPRO
+Netvibes
+NetZIP
 Niki-bot
 Nikto
 NimbleCrawler
+Nimbostratus
 Ninja
-Nmap
 Nutch
+Octopus
 Offline Explorer
-Offline Navigator
-Openfind
 Openvas
-OrangeSpider
-OutclicksBot
 OutfoxBot
-PageGrabber
+PageAnalyzer
 page scorer
-Pandalytics
-Pavuk
+Panscient
+Papa Foto
+pcBrowser
+PECL::HTTP
 PeoplePal
+PHPCrawl
+Picscout
 Picsearch
+PictureFinder
 Pixray
-PleaseCrawl
-Pockey
+plumanalytics
+POE-Component-Client-HTTP
 Probethenet
 ProPowerBot
 ProWebWalker
-Psbot
 Pump
+PxBroker
 PyCurl
+RankActiveLinkBot
+RankingBot
 RankingBot2
-Rankivabot
-Reaper
-Recorder
-RepoMonkey
-Ripper
-RocketCrawler
+RealDownload
+RebelMouse
+ReGet
 Rogerbot
 s1z.ru
-ScanAlert
-Searchestate
-SEOkicks
-SEOkicks-Robot
+SalesIntelligent
+ScoutJet
+Scrapy
+Screaming
+ScreenerBot
 SEOlyticsCrawler
-Seomoz
-SeoSiteCheckup
+seoscanners
+SEOstats
 Shodan
 Siphon
-SISTRIX
-Siteimprove
+Sitebeam
+SiteSucker
 Site Sucker
 Sitevigil
 SlySearch
-SmartDownload
-SMTBot
 Snake
-Sociscraper
-sogouspider
+SocialRankIOBot
 Sogou web spider
-Sottopop
-Spammen
-Spanner
+Sosospider
+SputnikBot
 spyfu
+Sqlmap
+Sqlworm
 Sqworm
 Steeler
 Sucuri
+SuperBot
 SuperHTTP
-SurveyBot
 Suzuran
+sysscan
+Szukacz
+tAkeOut
 Teleport
-The Intraformant
+TeleportPro
+Telesoft
+Telesphoreo
 TheNomad
-Thumbor
 TightTwatBot
-Toata
+Titan
 Toweyabot
-Tracemyfile
 Trendiction
+Trendictionbot
 trendiction.com
-trendiction.de
-Turnitin
 TurnitinBot
 TwengaBot
-UnisterBot
+Twice
+Typhoeus
 Upflow
 URLy Warning
+URLy.Warning
+Vacuum
 Vagabondo
-Virusdie
-WallpapersHD
-Webalta
-Web Collage
-WEBDAV
-WebEnhancer
+VeriCiteCrawler
+VidibleScraper
+VoidEYE
+Voltron
+WBSearchBot
+Web Auto
+WebBandit
+WebCollage
 WebFetch
+WebFuck
+Web Fuck
+WebGo IS
 WebImageCollector
 WebLeacher
 webmeup-crawler
-WebPix
+Web Pix
+WebReaper
 WebSauger
 Web Sauger
-WebsiteExtractor
-Webster
-WebStripper
-WebWhacker
-WiseGuys Robot
+WebsiteQuester
+WebZIP
+Whacker
+Who.is Bot
+Widow
+WinHTTrack
 WISENutbot
-Wonderbot
 Woobot
-WWW::Mechanize
 WWWOFFLE
 x22Mozilla
 Xaldon WebSpider
+Xaldon_WebSpider
+Xenu
 xpymep1.exe
-zauba.io
+YoudaoBot
+Zauba
+Zermelo
 Zeus
+zgrab
 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 454f5a7dc..85cb52010 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 @@
-adloads.com
-betterhdporn.com
-cityadspix.com
-erotiktreff24.info
-jbl-charge.info
-life.biz.ua
-monsterdivx.tv
-site-auditor.online
-styro.ru
-xn----itbkqkfiq.xn--p1ai
+bingo8888.com
+cracksplanet.com
+kabbalah-red-bracelets.com
+sobecjvuwa.com.ru
+strag-invest.ru
+swagbucks.com
+tacbelarus.ru
+torontoplumbinggroup.com
+wildcattube.com
+yellowstonevisitortours.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index b6b2a8482..c9e5e5668 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 @@
-00webcams.com
+03p.info
 1000n1.ru
-123movies.love
-1-99seo.com
-1qingdao.com
-2drittel.de
-2itech.ru
-3-letter-domains.net
-45en.ru
-4kpics.rocks
-777-club.ru
-7wind.ru
+1001watch.com.ua
+123locker.com
+21h2o.com
+2728fb936f0.com
+3w24.com
+3xforum.ro
+4webmasters.org
 91abcw.com
-a14download.com
-aa08daf7e13b6345e09e92f771507fa5f4.com
-abcguru.xyz
-absolutelyanalog.com
-abtasty.com
-addblueoff.com.ua
-ads.gold
-adsland.men
-adultfriendfinder.com
-affiliate-fr.com
-a.frcls.fr
-aihelen.net
-alevinefesleri.com
-alienwheels.de
-alkoravto.ru
-alphacarolinas.com
-alpinism.ru
-amazon-adsystem.com
-ampower.me
-amyfoxfitness.com
-android-style.com
-angry-fermi-7633.arukascloud.io
-apartment.ru
-apiitsthirteende-a.akamaihd.net
-apilinkswiftco-a.akamaihd.net
-applyneedy.xyz
-apptester.tk
-arabsexxxtube.com
-arius.tech
-arquapetrarca.info
-atlant-auto.info
-autobrennero.it
-autoua.top
-ayerbo.xhost.ro
-azartniy-bonus.com
-azbaseimages.net
-azte.ch
-backgroundpictures.net
+991mostfm.co.id
+aab94f698f36684c5a852a2ef272e031bb.com
+abovetherivernc.com
+absolute-s.ru
+accessoires-mode.in
+adidas.frwebs.fr
+admitad.com
+adrunnr.com
+advertex.info
+affordablewebsitesandmobileapps.com
+aibolita.com
+alert.scansafe.net
+all4invest.ru
+allnews.md
+alt-servis.ru
+aludecor.info
+amateurgalls.com
+amehdaily.com
+amung.us
+angel1777.kz
+apiadanaknet-a.akamaihd.net
+apiluckyleapnet-a.akamaihd.net
+apimegabrowsebiz-a.akamaihd.net
+apispringsmartne-a.akamaihd.net
+apple.com-cleaner.systems
+approvedlocal.co.za
+appsaurus.com
+ardimobileinfo.ml
+arraty.altervista.org
+arvut.org
+astrochicks.com
+atelielembrancaqueencanta.com.br
+atout-energie-69.com
+australia-opening-times.com
+autochoixspinelli.com
+autolombard-krasnodar.ru
+autoplate.info
+aviav.ru.com
+avto-oligarh.ru
+babyfactory.fr
 baersaratov.ru
-bagsonsale.online
-balkanfarma.org
-bambi.ck.ua
-bangla-chat-uk-paralud.ga
-bank.uz
-bashtime.ru
-battleforupdating.site
-bbtec.net
-bcmp.org
-beetpics.pw
-bestofupload.info
-bestpriceninja.com
-bestwebsitesawards.com
-beta.hotkeys.com
-bezsporno.ru
-bidbuy.co.kr
-bigames.online
-biketank.ga
-bikini-image.com
-bimatoprost-careprost.com.ua
-bioscorp.ru
-biznesluxe.ru
-bkgr.se
-blobar.org
-blog.remote-computer.de
+baixar-musicas-gratis.com
+balois.worldbreak.com
+banan.tv
+basisches-wasser.net
+bear.gotcher.us
+beauty-bracelet.com
+bestchoice.cf
+bestfortraders.com
+best-seo-solution.com
+besttorrentknifta.weebly.com
+betterscooter.com
+biglistofwebsites.com
+binomo.com
+biteg.xyz
+bizcheapjerseyswholesalechina.com
 bonky.biz
+bonzbuddy.com
 boo-arts.com
-bookmark4you.com.biz
-brainboostingsupplements.org
-brg8.com
-burn-fat.ga
-buy-cheap-pills-order-online.com
-buyessay3.blogspot.ru
-buyessayonline19.blogspot.ru
-buy-forum.ru
-buypanicdisorderpill.com
-buyviagraa.blogspot.com
-byme.se
-cakemediahq.com.au
+boobsimge.com
+bosefux.esy.es
+brainboosting.club
+browserprotecter.com
+budpost.com.ua
+bukleteg.xyz
+bumascloset.com
+buron.pw
+bus-offer.com
+butstrap.space
+buttons-for-your-website.com
+buyhoverboard.com
+buyk.host.sk
+buypuppies.ca
+buzzonclick.com
+buzz-porno.info
+cakesplus.com.au
+candlehandmade.com
+candypeople.se
 candytiner.com
-canzoni.ru
-carsplate.com
+carfax.com.ua
+cartierjusteunclou.xyz
+cartierreplica.pw
 catalogs-parts.com
-cbox.ws
-cdncash.com
-cdncash.org
-cejewelry.xyz
-ceotrk.com
-cercacamion.it
-c-gainsbourg.com
-chatroulette.si
-cheapestjerseysonwholesale.com
-cheap-trusted-backlinks.com
-chee-by.biz
-chinajerseyswholesalecoupons.com
-christianlouboutinreplica.pw
-cienum.fr
-cineacademy.ru
-cinemaenergy-hd.ru
-cinemaflix.website
-colobit.biz
+cbb1smartlist12.click
+cctva.tv
+cdncash.net
+celejihad.info
+cete.ru
+chatroulette.video
+chocolateslim-original.com
+christianlouboutinsaleoutletonline.us
+ciceros.co
+citizenclsdriveri7.pen.io
+civilwartheater.com
+clean-virus-mac.com
+clickcash.com
+clickprotects.com
+clksite.com
 comeondog.info
 communisave.co.za
-compliance-checker.info
-compliance-irvin.top
-compliance-julianna.top
-compliance-julia.top
-cordstrap.cc
-cornomase.win
+community.allhiphop.com
+com-onlinesupport.host
+compiko.info
+compliance-ivan.top
+compliance-jack.top
+compliance-jane.top
+compliance-margo.top
+com-supportcenter.website
+cookie-law-enforcement-hh.xyz
+coolwallpapers-hd.com
+counter.yadro.ru
+country-chic.ru
+covadhosting.biz
+creams.makeforum.eu
+cryptoswap.biz
+cs-passion.pl
+customboxes4less.com
+cutalltheshit.com
+cvety24.by
+cyprusbuyproperties.com
 daooda.com
-dcj-nn.ru
+dbmkfhqk.bloger.index.hr
+dealitright.click
+deanmoore.ie
 decoratinghomes.ga
-delfin-aqua.com.ua
-design-ideas.info
+delta-line.men
+deplim.com
 destinationrealestate.com
-detskie-konstruktory.ru
 dev-seo.blog
-dikqlyremy.info
-discovertreasurenow.com
-djstools.com
-docstoc.com
-doctormakarova.ru
-documentbase.net
-dominateforex.ml
-downloadeer.net
-dptaughtme.com
-drpornogratisx.xxx
-dtnlyss.com
-dwomlink.info
-ecxtracking.com
-efnor-ac.com
-ekaterinburg.xrus.org
-ekto.ee
+dgfitness.co
+dichvuvesinhhanoi.com
+diesel-parts28.ru
+digilander.libero.it
+dimaka.info
+dipstar.org
+dirtpics.pw
+discovertreasure-a.akamaihd.net
+djonwatch.ru
+dkvorota.ru
+doeco.ru
+domainsatcost.com
+domain-tracker.com
+doska-vsem.ru
+downloads-whatsapp.com
+download-wallpaper.net
+eandsgallery.com
+earn-from-articles.com
+easync.io
+ed-shop01.ru
+efkt.jp
 elektrischezigarette1.blog.pl
-elektrischezigarette1.onsugar.com
-elektrozigaretten1.postbit.com
-emediate.eu
-empathica.com
-engines-usa.com
-escortplius.com
-esfchat.tk
-euromasterclass.ru
-extremez.net
-fearcrow.com
-filmetricsasia.com
-filmgo.ru
-filunika.com.ru
-findacheaplawyers.com
-firstsiteguide.com
-fiuxy.com
-flex4launch.ru
-floating-share-buttons.com
-flowwwers.com
-fortevidyoze.net
-foxinsocks.ru
-franecki.net
-freshberry.com.ua
-ftns.ru
-fun2cell.net
-fungirlsgames.net
-fun-mobi.pl
-funnymama.com
-fxgallery.com
-gearsadspromo.club
-generalporn.org
+elektrischezigarettekaufen2.cowblog.fr
+elitesportsadvisor.com
+eloxal.ru
+elvenmachine.com
+embedle.com
+emergencyneeds.org
+en.home-task.com
+eredijovon.com
+erotikstories.ru
+erotische-geschichten-xxl.com
+errorfixing.space
+essay-writing.work
+etotupo.ru
+everypony.ru
+excitacion.info
+ezaz.info
+ezigarettekaufen2.blox.pl
+ezrvrentals.com
+f00kclan.de
+facebook-mobile.xyz
+falllow.gq
+fashion-stickers.ru
+fastfixing.tech
+favoritemoney.ru
+fickenbumsen.net
+fishingwholesale.us
+forexgb.ru
+forexunion.net
+foxtechfpv.com
+franch.info
+freegamesplay.online
+free-laptop-reward.com
+freelotto.com
+free-traffic.xyz
+frivgame250.com
+fsakhalin.ru
+funnypica.com
+gameplexcity.com
+gamezblox.com
+gavuer.ru
+gay-file.com
+gaytube.com
 germetiki.com.ua
-get-free-social-traffic.com
+getlamborghini.ga
+get-your-social-buttons.info
 ghernnqr.skyrock.com
-girlgamerdaily.com
-golfresa.lucania.se
-good-mummy.ru
-gpms.org.my
-gq-catalog.gq
-green-tea.tv
-gsasearchengineranker.pw
+go2jump.org
+goodhumor24.com
+goosefishpost.bid
+gopro-online.info
+greenzaim.ru
+grtyi.com
 guardlink.com
-hahashka.ru
-havepussy.com
+habermetre.com
 hawaiisurf.com
-hdpixion.com
-healthcarestore.info
-help.tpu.ru
-hentaiheroes.com
-highstairs-a.akamaihd.net
-hkdiiohi.skyrock.com
-hledejvshopech.cz
-hobbyhuren24.net
+heatpower.ru
+histock.info
+historichometeam.com
+hitsbox.info
 hobbyhuren-datenbank.com
-hollywoodactress.info
-hop.clickbank.net
-host-protection.com
-hostsshop.ru
-howopen.ru
-howtowhitenteethfast.xyz
-hully.altervista.org
-humanorightswatch.org
-id-forex.com
-ie.57883.net
-ilte.info
+homemade.gq
+hothot.ru
+hreade.com
+https-legalrc.biz
+hundejo.com
+icaseclub.ru
+iklysha.ml
+ilovevitaly.xyz
 images-free.net
-imgarcade.com
-inet-traffic.com
-insider.pro
-interfucks.net
-internetproviderstucson.com
-intimshop-fantasy.ru
-iscblog.info
-isistaylorporn.info
-isotoner.com
-istanbulit.com
-jose.mulinohouse.co
-justdating.online
-kaidalibor.de
-karadene.com
-kareliatobacco.ru
-katushka.net
-kchaxton.com
+imediadesk.com
+imicrovision.com
+infazavr.ru
+innoslicon.com
+inome.com.ua
+inspiring-desperate.tk
+insurple.com
+intermesh.net
+internet-apteka.ru
+invitefashion.com
+iqoption.pro
+i-service.kz
+iwantedmoney.com
+iwanttodeliver.com
+jacago.com
+jackwolfskinoutlet.online
+japan-bearings.ru
+jennyfire.ru
+jobmarket.com.ua
+joessmogtestonly.com
+johnrobertsoninc.com
+jovencitas.gratis
+karaganda.xkaz.org
+karpun-iris.ru
+kenaba.su
 kerch.site
-kinocccp.net
-kinoflux.net
-kit-opt.ru
-kiwe-analytics.com
-klejonka.info
-klitimg.pw
-konkursov.net
-krafte.ru
-laapp.com
-labplus.ru
-laexotic.com
-lanadelreyfans.us
-landscaping.center
-laptoper.net
-larchik.net
-law-check-nine.xyz
-lego4x4.ru
-letsart.ru
-li-er.ru
-littleberry.ru
-littlecity.ch
-liveu.infoteka.hu
-localmatchbook.com
-locationdesaison.com
-lockerz.com
-locksmith.jp
-lovelycraftyhome.com
-lovi-moment.com.ua
+keywords-monitoring-your-success.com
+kidd.reunionwatch.com
+kinobaks.com
+kinohit1.ru
+kino-rating.ru
+kongoultry.net
+krasivoe-hd.com
+krasivoe-hd.net
+krasnodar-avtolombards.ru
+kretpicf.pw
+ku6.com
+kumuk.info
+lennatin.info
+lernur.net
+letslowbefast.today
+lifehacĸer.com
+likesdesign.com
+lion.misba.us
+live-sexcam.tk
+lkbennettoutlet.online
+longadventure.com
+longgreen.info
 luxup.ru
-macdamaged.space
+mabdoola.blogspot.com
 mackeeper-center.club
-makedo.ru
-manipulyator-peterburg.ru
-manualterap.roleforum.ru
-map028.com
-mapquestz.us
-marcowebonyodziezowe.pl
-markjaybeefractal.com
-matb3aa.com
-max-eclat.men
-m.b00kmarks.com
+magicalfind-a.akamaihd.net
+mansparskats.com
+manyresultshub-a.akamaihd.net
+marketland.ml
+massage-info.nl
+max-p.men
+maxthon.com
 medizinreisen.de
-medtherapy.ru
-meendo-free-traffic.ga
-me-ke.com
-mikrobiologies.ru
-miniads.ca
-mirmedinfo.ru
-monsterdivx.tv
-moscow.online-podarki.com
-moscow-region.ru
-mustat.com
-mybinaryoptionsrobot.com
-mymercy.info
-myseoconsultant.com
-myshopmatemac.com
-nakozhe.com
-nero-us.com
-nerudlogistik.ru
-netpics.org
-networkcheck.xyz
-newstraveller.ru
-nippon-bearings.ru
-nmrk.ru
-november-lax.com
-nvformula.ru
-oballergiya.ru
-obsessionphrases.com
-o-dachnik.ru
-of-ireland.info
-okayimage.com
+mega-bony2017.pl
+mexicosleevegastrectomy.com
+mil-stak.com
+mindeyegames.com
+mir-business-24.ru
+mmog-play.ru
+mncrftpcs.com
+modabutik.ru
+moesonce.com
+monarchfind-a.akamaihd.net
+moncleronline.xyz
+moscow-clining.ru
+moskva.nodup.ru
+mrmoneymustache.com
+musicktab.com
+muycerdas.xxx
+mydearest.co
+mydirtyhobby.com
+mygameplus.com
+nagdak.ru
+narco24.me
+njkmznnb.ru
+o00.in
+obuv-kupit.ru
 okmedia.sk
-okout.ru
-olgacvetmet.com
-onclickpredictiv.com
-one-gear.com
-onemactrckr.com
-online-sbank.ru
-onlineslotmaschine.com
-onload.pw
-ops.picscout.com
-orion-v.com
-oxford-book.com.ua
-panamaforbeginners.com
-papasdelivery.ru
-pcads.ru
+omoikiri-japan.ru
+onemantrip.com
+online-hd.pl
+online-x.ru
+openmediasoft.com
+otbelivanie-zubov.com
+oynat.info
+pacificair.com
+pagesense.com
+palvira.com.ua
+parajumpersstore.online
+patterntrader-en.com
+pattersonsweb.com
 pc-services.ru
 pearlisland.ru
-pensplan.com
+pelfind.me
+perl.dp.ua
+perm-profnastil.ru
+petrovka-online.com
 picphotos.net
-picsforkeywordsuggestion.com
-pijoto.net
-pinwallpaper.xyz
-pisanieprac.info
-pix-hd.com
-pizdeishn.com
-pk-pomosch.ru
-plastjulgranar.se
-playfortuna-play.ru
-play-movie.pl
-pliks.pl
-poem-paying.gq
+pills24h.com
+piluli.info
+pintattoos.com
+piski.top
+play.leadzupc.com
+podshipniki-nsk.ru
 poems.com.ua
-polimga.pw
-porngalleries.top
-pornoplen.com
-pornotubs.com
-pozdrawleniya.ru
-preventheadacheguide.info
-prod2016.com
-progonrumarket.ru
-projectforte.ru
-pronorm.fr
-pro-poly.ru
-pst2017.onlinewebshop.net
-pts163.ru
-quelle.ru
-questionmarque.ch
-quick-offer.com
-ranksignals.com
-ranksonic.info
-ranksonic.org
-realmonte.net
-redhotfreebies.co.uk
-redirectme.net
-remedyotc.com
-renecaovilla.online
-renewablewealth.com
-richinvestmonitor.com
-ring4rhino.com
-rixpix.ru
-rosbalt.com.ua
-rossanasaavedra.net
+pokerniydom.ru
+popunder.net
+poquoson.org
+pornogratisdiario.com
+pornosmola.info
+printie.com
+productarium.com
+produkto.net
+profitsport.club
+profitwithalex.info
+promoforum.ru
+push-ad.com
+quickcashlimited.com
+ragecash.com
+rankingchart.de
+razyboard.com
+referencemoi.com
+refudiatethissarah.info
+registry-clean-up.net
+resellerclub.com
+restaurantlescampi.com
+reversing.cc
+rewardpoll.com
+ringporno.com
+rogervivierforsale.com
+roma-kukareku.livejournal.com
+rospromtest.ru
+rubanners.com
 rukino.org
-sabizonline.com
-sad-torg.com.ua
-samo-soznanie.ru
-saneyes.com
-santasgift.ml
-sardinie.us
+runofilms.ru
+sabaapress.com
+saddiechoua.com
+sarf3omlat.com
+sawin.beth.webd.pl
 sbdl.no
-scanner-fred.top
-scanner-walter.top
-scansafe.net
+sbetodiodnye-lampy.ru
+scanner-elena.top
+scanner-julianna.top
+scanner-mary.top
 scmor.ilxc.cc
-sdelai-prosto.ru
-searchimage.co
-searchkut.com
-senger.atspace.co.uk
-serpstat.com
-sex.hotblog.top
-sexkontakte-seite.com
-sexphoto.site
+searchengineranker.email
+seotoolsagency.com
+service-core.ru
 sexvideo-sex.com
-sexystrippe.info
-sharpchallenge.com
-shitmovs.com
-shodanhq.com
-shopcheermakeup.info
-shopsellcardsdumps.com
-sibtest.ru
-simple-image.com.ua
-skytraf.xyz
-sledstvie-veli.net
-smstraf.ru
-snegozaderzhatel.ru
-snjack.info
-socialbuttons.xyz
-socialmadesimple.com
-social-search.me
-solnplast.ru
+shinikiev.com.ua
+ship-marvel.co.ua
+shohanb.com
+shoppingjequiti.com.br
+shoppingmiracles.co.uk
+shoppytoolmac.com
+sibvitr.ru
+sigmund-freud.co.uk
+signx.info
+silvermature.net
+sinestesia.host.sk
+site-speed-checker.site
+si-unique.com
+skachat-besplatno-obrazcy.ru
+s.lollypopgaming.com
+sluganarodu.ru
+slujbauborki.ru
+smart-balancewheel.com
+social-buttons.xyz
+socialseet.ru
+softomix.com
+soochi.co
+sophang8.com
+space4updating.win
 spaceshipad.com
-sportbetfair.com
-stanthonyscatholicchurch.org
-startufa.ru
-statustroll.com
-steelmaster.lv
-stockquotes.wooeb.com
-storehouse.ua
-strangeduckfilms.com
-streetfooduncovered.com
-stretchmate.net
-strfls.com
-suggest-keywords.com
-suhanpacktech.com
-sukarame.net
-superoboi.com.ua
-survival.betteroffers.review
-symphonyintegratedhealthcare.com
-tandvardshuset.net
-tattooha.com
-techart24.com
-tedy.su
-telsis.com
-teslathemes.com
-thedownloadfromwarez.blogspot.com
-theendivechronicles.com
-thefotosgratis.eu
-thegioixekhach.com
-the-usa-games.blogspot.com
-tizanidine4mgstreetvalue.blogspot.com
-toolsky.com
-topclickguru.com
-top-deal.com.pl
-topsy.com
-topvidos.ru
-tracfone.com
-traffic-club.info
-try-rx.com
-tubo360.com
-turist-strani.ru
-twiclub.in
-twincitiescarservice.com
-umg-stroy.ru
-unionmarkt.de
-unisexjewelry.org
-unitexindia.com
-unmaroll.ya.ru
-vbabule.net
-vesnatehno.com
-viagra.pp.ua
+speedup-my.site
+spidtest.org
+sprttrack.com
+staticfs.host
+statistici.ro
+sterva.cc
+stroiminsk.org
+supermesta.ru
+swinon.site
+syvertsen-da.no
+szucs.ru
+t-bygg.com
+td-l-market.ru
+tdsing.ru
+tehngr.ru
+theporndude.com
+tilido.com
+timdreby.com
+tizanidine4mg.blogspot.com
+tizanidineandcipro.blogspot.com
+tizanidinecost.blogspot.com
+todohr.com
+toon-families.com
+topappspro.com
+toproadrunner5.info
+track-rankings.online
+tradgardspartner.se
+trafficfactory.biz
+trafficgenius.xyz
+trafficjunky.net
+trion.od.ua
+tri-slona.org
+tsan.net
+tuberkulezanet.ru
+ultimateclassicrock.com
+umaseh.com
+uptimebot.net
+vabasa.inwtrade.com
+vandrie-ict.nl
+vedomstvo.net
+vegan-foods.us
+velobikestock.com
+via-energy-cumpara.com
 viddyoze.com
-viel.su
-viteonlusarezzo.it
+videochat.bz
+videochat.ph
+vilingstore.net
+virtuagirl.com
+vitoriacabos.com
+vkak.ru
 vkonche.com
-vmnmvzsmn.over-blog.com
-vodkoved.ru
-voloo.ru
-voluumtracker1.com
-voronezh.xrus.org
-vozbujdenie.com
-vucms.com
-vvon.co.uk
-vysigy.su
-vzlom-na-zakaz.com
-wallpapersist.com
-warning.or.kr
-waysbetter.cn
-weboptimizes.com
-website-speed-check.site
-website-stealer.nufaq.com
-welcomeauto.ru
-wemedinc.com
-wesharepics.site
-whiteproduct.com
-wholesalecheapjerseysfree.com
-wineitudes.wordpress.com
-womens-journal.net
+vladimir.zrus.org
+vltai.com
+vodaodessa.com
+vote-up.ru
+vpnhowto.info
+vseuznaem.com
+warezaccess.com
+webkeyit.com
+weburlopener.com
+wesharepics.info
+whatistizanidinehclusedfor.blogspot.com
+winwotgold.pl
+wordkeyhelper.com
+ws.ampower.me
+www.arenda-yeisk.ru
 wzgyyq.com
-xcombear.ru
-xlovecam.com
-xn--80aafb2a.xn--p1ai
-xxxdatinglocal.us
-xxxnatelefon.ru
-yaaknaa.info
-youbloodyripper.com
-youjizz.com
-youporn-ru.com
-yourtemplatefinder.com
-youtube-downloader.savetubevideo.com
-yugk.net
-zaimite.ru
-zajm-zalog-krasnodar.ru
-zhuravlev.info
-zigarettenonlinekaufen1.blox.pl
-znakomstva-moskva77.ru
-zolotoy-lis.ru
-zoosexart.com
-zynax.ua
-zytpirwai.net
+x5market.ru
+xboxster.ru
+x-lime.net
+xn--24-glceagatoq7c2a6ioc.xn--p1ai
+xn--80abgj3a5acid6ghs.top
+xn--80aebbcbcdemfkhba4byaehoejh8dza3v.xn--p1ai
+xn----8sbhefaln6acifdaon5c6f4axh.xn--p1ai
+xn----9sbubg3ambdfl1j.xn--p1ai
+xn--b1agm2d.net
+xn----dtbndd4ae7eub.top
+xrus.org
+yottos.com
+yougotanewdomain.com
+youresponsive.com
+yourserverisdown.com
+yuarra.pluto.ro
+zaloro.com
+zeleznobeton.ru
+zeroredirect11.com
+zeroredirect2.com
+zeroredirect9.com
+zocaparj.kz
+zojirushi-products.ru
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 606001d99..a5b6ab66c 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 @@
-24-ak.ru
-273-fz.ru
-2itech.ru
-adsloads.com
-agahinameh.com
-agreda.pluto.ro
-aktivator-windows10.blogspot.com
-ample-awards-today.us
-anniemation.com
+1millionusd.xyz
+2daytrendingnews.com
+4kepics.com
+4pp13.com
+5elementov.ru
+adclickthru.net
+adverster.com
+allwidewallpapers.com
+alta-realestate.com
 apiitsthirteende-a.akamaihd.net
-arius.tech
-atmovs.com
-baladur.ru
-bankcrediti.ru
-benchmarkcommunications.co.uk
-bestimagecoollibrary.com
-big-cash.net
-binomo.kz
+artdestshop.eu
+artel116.ru
+articlesdirectoryme.info
+asacopaco.tk
+autobudpostach.club
+avon-severozapad.ru
+awency.com
+azartniy-bonus.com
+bagsonsale.online
+bambi.ck.ua
+bbtec.net
+bg6s0.com
+bimatoprost-careprost.com
+biographiya.com
+biznesschat.net
 bkgr.se
-blockety.co
+blogrankers.com
 bochemit.com.ua
-boobsimge.com
-bracketsmackdown.com
-brimstonehillfortress.org
-bryansk.zrus.org
-bukleteg.xyz
-bumskontakte.org
-buyessayonline19.blogspot.ru
-cardul.ru
-cashonads.com
-cdn.walkme.com
-cheapestjerseys-wholesale.com
-cheap-trusted-backlinks.com
-checktext.org
-chimiver.info
-clickbanksites.info
-clmforexeu.com
-coinsspb.com
-compliance-walt.top
-coolgramgoods.com
-crest3d.ru
-dating-app.ru
-dawlenie.com
-dealwifi.com
-deanmoore.ie
-deda-moroza-zakaz.ru
-discovertreasurenow.com
-downvids.net
-doxysexy.com
-dverimegapolis.ru
-eaplay.ru
-econom.co
-elektrozigaretten2.yn.lt
-eloxal.ru
-errorfixing.space
-escortplius.com
-eshop4u.jp
-executehosting.com
-expolicenciaslatam.co
-ezaz.info
-ezigaretteshop2.mywapblog.com
-farm26.ru
-farmprofi.net
-fashion-stickers.ru
+bolegapakistan.com
+boole.onlinewebshop.net
+brandehk.dk
+burger-imperia.com
+businescoop.men
+buyk.host.sk
+buynorxx.com
+buytizanidineonlinenoprescription.blogspot.com
+buzzurl.jp
+bvlgariwallet.xyz
+candypeople.se
+candytiner.com
+carapics.com
+cartierreplica.xyz
+cfsrating.sonicwall.com
+cheapjerseysap.com
+checkpagerank.net
+cityadspix.com
+cleanpcnow.com
+clickintext.net
+clippingphotoindia.com
+club-musics.ru
+compliance-andrew.xyz
+compliance-josh.top
+comsysnet.com
+conboy.us
+delayreferat.ru
+dividendo.ru
+djonwatch.ru
+dms-sw.ru
+easync.io
+ekosmetyki.net.pl
+eladkarako.github.io
+elmifarhangi.com
+el-nation.com
+eurosamodelki.ru
+expresstoplivo.ru
+eyes-on-you.ga
+facebook-mobile.xyz
+factorynightclub.com
+fashionindeed.ml
 fatfasts-4tmz.com
-fdzone.org
-feeriaclub.ru
 figuringmoneyout.com
-fm-upgrade.ru
-foodcrafts.website
-food.dtu.dk
-forumprofi.de
-foto-basa.com
+filmidivx.com
+fishingwholesale.us
+fitnesspiks.com
+fitness-video.net
+fortevidyoze.net
 foxinsocks.ru
-freeseedsonline.com
-free-share-buttons.com
-funnymama.com
-gambarkatabaru.com
-gambarxkata.co
-gamesprite.me
-gardene.ru
-gazporno.com
-geile-lelly.eu
-generalporn.org
-gfaq.ru
-girlgamerdaily.com
-globetrotting-culture.ru
-good-mummy.ru
-goosefishpost.bid
-gotomontenegro.net
-gsasearchengineranker.space
-gtopstats.com
-hard-porn.mobi
-hd-film.pl
-histats.com
+free-share-buttons.top
+freewareseek.com
+gamerextra.com
+get-your-social-buttons.info
+ggiaro.com
+gkvector.ru
+go2mike.ru
+gogalleryawesome.com
+gonextmedia.com
+gopixdatabase.com
+gosmeb.ru
+growshop.es
+guruofcasino.com
+gwebtools.com.br
+headpress.ru
+healbio.ru
 hit-kino.ru
-hostnow.men
-host-tracker.com
-hotsocialz.com
-hoverboard360.nl
-incest-ru.com
-intelhdgraphicsgtdrive6w.metroblog.com
-investyb.com
-javidol.site
-jyvopys.com
-karting196.ru
-keywordhut.com
-kinocccp.net
-konpax.com
-konteiner24.com
-kriokomora.info
-kung-fu-ru.com
-landoftracking.com
-landreferat.ru
-leboard.ru
-lenvred.org
-lesbian.xyz
-lifeinsurancekb.com
-littlesunraiser.com
-live-sexchat.ru
-lob.com.ru
-low-format.ru
-lsp-awak-perikanan.com
-m292.info
-magazin-pics.ru
-mathgym.com.au
-medosmotr-ufa.ru
-mega-bony-2017.pl
-memberty.com
-missclub.info
-mobioffertrck.com
-mobsfun.net
-moesonce.com
-mossmesi.com
-mrmoneymustache.com
-musezone.su
-mydeathspace.com
-myindospace.com
+hkladys.com
+hoste.octopis.com
+hostingclub.lk
+hotblognetwork.com
+husky-shop.cz
+iflycapetown.co.za
+ilovevitaly.ru
+indiasourcemart.in
+informatiecentro.be
+infospot.pt
+itrevolution.cf
+iweblist.info
+j33x.com
+japfm.com
+jaxcube.info
+jovencitas.gratis
+kazka.ru
+keywordhouse.com
+kliksaya.com
+knowyournextmove.com
+konturkrasoty.ru
+kvartir-remont.biz
+lacapilla.info
+lacave.ntic.fr
+languagecode.com
+larchik.net
+ldrtrack.com
+letmacwork.world
+li-er.ru
+linkredirect.biz
+lisque.batcave.net
+livingroomdecor.info
+lkbennettoutlet.online
+locimge.pw
+lottospring.com
+markjaybeefractal.com
+marsgatan.com
+matematikus.info
+matrixalchemy.com
+medizinreisen.de
+meendo-free-traffic.ga
+mesbuta.info
+minecraft-rus.org
+miniads.ca
+mmoguider.ru
+mnogabukaff.net
+mobplayer.net
+modenamebel.ru
+monthlywinners.com
+morocco-nomad-excursions.com
+mrinsidesales.com
+mrvideospornogratis.xxx
+music.utrolive.ru
 nelc.edu.eg
-odesproperty.com
-oneclickfiles.com
-onefilms.net
-online-podarki.com
-osb.se11.ru
-ossmalta.com
-paradontozanet.ru
-parajumpersstore.online
-peekyou.com
-pepperstyle.ru
-photostudiolightings.com
-pl.aasoldes.fr
+noumeda.com
+nufaq.com
+obesidadealgarve.com
+oda.as
+offer.camp
+okonich.com.ua
+okuos.com
+onemantrip.com
+o-o-11-o-o.com
+otbelivanie-zubov.com
+partner-stop.men
+pastaleads.com
+petitions.whitehouse.gov
+playlott.com
+pobeiranie.pl
 pontiacsolstice.info
-poppen-nw.net
-porndl.org
-pornmania.pl
-portal-eu.ru
-pravoholding.ru
-preventheadacheguide.info
-privatbank46.ru
-prod2016.com
-projefrio.com.br
-pst2017.onlinewebshop.net
-qualitymarketzone.com
-remybutler.fr
-renecaovillasale.online
-rentalcarnavi.info
-ritlweb.com
-royalads.net
-searchinquire.com
-searchlock.com
-seofirmreviewsus.info
-seorankinglinks.us
-seotoolsagency.com
-shivafurnishings.com
-shop.acim.org
-sibdevice.ru
-simply.net
-sitevalued.com
-s-iwantyou.com
-sk.golden-praga.ru
-slkrm.ru
-slutloadlive.com
+popugaychiki.com
+pourvous.info
+praisong.net
+primedice.com
+pulse33.ru
+push-ad.com
+puzzleweb.ru
+qitt.ru
+ratemodels.net
+remont-komputerov-notebook.ru
+remont-ustanovka-tehniki.ru
+renecaovilla.online
+ruf777.com
+rumamba.com
+ruspdd.com
+rus-teh.narod.ru
+sack.net
+samolet.fr
+sandhillsonline.com
+scanner-olga.top
+searchaddis.com
+seemoreresultshu-a.akamaihd.net
+serdcenebolit.com
+sexytrend.ru
+shopvilleroyboch.com.ua
+skuteczna-dieta.co.pl
+small-game.com
 snts.shell-pmr.ru
-snworks.com
-sobecjvuwa.com.ru
-socialbookmarksubmission.org
-socialbuttons.xyz
-social-vestnik.ru
-soft-terminal.ru
-spylog.com
-stardevine.com
-students-cheapskate.ml
-superkanpo.com
-supermesta.ru
-superoboi.com.ua
-svnuppsalaorebro.se
-swagbucks.com
-taaaak.com
-telefonsexkostenlos.tk
-thegameriders.com
-thetardistimes.ovh
-thetattoohut.com
-the-torrent-tracker.blogspot.com
-thin.me.pn
+spywareit.com
+standardchartered-forex.com
+star61.de
+stpicks.com
+studiofmp.com
+swingerseiten.com
+syndicate.fun
+t3chtonic.com
+taqywu51.soup.io
+telefonsexi.com
+telegraf.by
+theendivechronicles.com
 timetorelax.biz
-tizanidinedosageforsleep.blogspot.com
-tizanidineshowupondrugtest.blogspot.com
-tizanidinestreetprice.blogspot.com
-topvidos.ru
-toyota.7zap.com
-tracfone.com
-trafaret74.ru
-trafficfactory.biz
-trahic.ru
-trustedhealthtips.com
-twincitiescarservice.com
-urengoy.pro
-urlopener.blogspot.com.au
-us-america.ru
-veerotech.com
-video-chat.in
-vitoriacabos.com
-vkgaleria.com
-vltai.com
-vrnelectro.ru
-vrotike.ru
-vucms.com
-waysbetter.cn
-web-betting.ru
+titan-ads.life
+tizanidine4mg.blogspot.com
+tizanidine4mgstreetprice.blogspot.com
+tizanidineandhydrocodone.blogspot.com
+tizanidinehcl2mgsideeffects.blogspot.com
+tomck.com
+top-karkas.ru
+topshef.ru
+toy-shop.top
+trion.od.ua
+tsyndicate.com
+turbabitload.weebly.com
+turist-strani.ru
+turkeyreport.tk
+uroki.net
+usiad.net
+valkiria-tk.ru
+vegan-foods.us
+viandpet.com
+video-hollywood.ru
+video--production.com
+vinylvault.co.uk
+visitcambridge.org
+vkonche.com
+voluumtracker1.com
+vsexkontakte.net
+wareseeker.com
+warezkeeper.com
+wdfdocando.com
 webjam.com
-webshoppermac.com
-websitevaluebot.com
-whereiskentoday.com
-world-mmo.com
-woweb.com.ua
-www.arenda-yeisk.ru
-xchangetrak.com
-xn--80ab4aa2g.xn--p1ai
-xn--80aebbcbcdemfkhba4byaehoejh8dza3v.xn--p1ai
-xn----8sbdbjgb1ap7a9c4czbh.xn--p1acf
-xn--oogle-wmc.com
-xtubeporno.net
-xvideosporn.biz
-yaderenergy.ru
-yourtemplatefinder.com
-yurgorod.ru
-zarajbuilders.com
-zed21.net
-znakomstvaonlain.ru
-zoosexart.com
+websiteaccountant.de
+wingsofrefuge.net
+w-journal.ru
+workle.website
+x-diesel.com
+xdoza.com
+xn--80ahdheogk5l.xn--p1ai
+xn--e1afanlbnfckd7c3d.xn--p1ai
+xtremeeagles.net
+xxx-cam.webcam
+xzlive.com
+yellocloud.be
+youtube-downloader.savetubevideo.com
+yuweng.info
+zeroredirect7.com
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index a7215fb74..f371d9e5f 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.txt
@@ -1,11 +1,21 @@
-<html>
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
+</html><html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.14.2</center>
 </body>
 </html>
-l>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -116,14 +126,4 @@ l>
 <h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
 <p>This is merely used for testing !!!</p>
 </body>
-</html><!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to NginX</title>
-</head>
-<body>
-<div align=center>
-<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
-<p>This is merely used for testing !!!</p>
-</body>
 </html>
\ No newline at end of file
diff --git a/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index c3c284efc..e42e64139 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.202.145.110	0;
+35.193.7.13	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 26a3c8310..ada31ea79 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 0de571e84..f4f558dc9 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 4085b5a9b..9844a7461 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1738
+#### Version: V4.2019.07.1739
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index a54f746f9..2d1910d77 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1738
+#### Version: V4.2019.07.1739
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index ba5b4e323..412275d90 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.1738
+#### Version: V4.2019.07.1739
 #### 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 b139650cb..34c7aea07 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.1738
+#### Version: V4.2019.07.1739
 #### 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 9d51c4794..611de4c80 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.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 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 4f5b6eb6d..f75458664 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.1738
-### Updated: Tue Jul  2 15:04:37 SAST 2019
+### Version: V3.2019.07.1739
+### Updated: Tue Jul  2 15:28:18 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index 9d51c4794..611de4c80 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1738
-### Updated: Tue Jul  2 15:04:35 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:17 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index 902756f53..c459c4260 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1738
-### Updated: Tue Jul  2 15:04:38 SAST 2019
+### Version: V4.2019.07.1739
+### Updated: Tue Jul  2 15:28:19 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##