diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index ce6c05325..209f53c06 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.1718
-### Updated: Mon Jul  1 13:21:39 SAST 2019
+### Version: V3.2019.07.1720
+### Updated: Mon Jul  1 14:31:32 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 0f27f0dd9..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 @@
-104.154.113.151	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 0e0848852..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 @@
-104.154.113.151	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 ce6c05325..209f53c06 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.1718
-### Updated: Mon Jul  1 13:21:39 SAST 2019
+### Version: V3.2019.07.1720
+### Updated: Mon Jul  1 14:31:32 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 0f27f0dd9..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 @@
-104.154.113.151	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 0e0848852..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 @@
-104.154.113.151	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 ce6c05325..209f53c06 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.1718
-### Updated: Mon Jul  1 13:21:39 SAST 2019
+### Version: V3.2019.07.1720
+### Updated: Mon Jul  1 14:31:32 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 0f27f0dd9..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 @@
-104.154.113.151	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 0e0848852..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 @@
-104.154.113.151	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 ce6c05325..209f53c06 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.1718
-### Updated: Mon Jul  1 13:21:39 SAST 2019
+### Version: V3.2019.07.1720
+### Updated: Mon Jul  1 14:31:32 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 ce6c05325..209f53c06 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1718
-### Updated: Mon Jul  1 13:21:39 SAST 2019
+### Version: V3.2019.07.1720
+### Updated: Mon Jul  1 14:31:32 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index f3e41611e..2f6a99041 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 ca4fcdf54..896ffe576 100644
--- a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +45,4 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.193.14.140           0;
+104.154.120.187         0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index f3e41611e..2f6a99041 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 b9d24324a..479de1217 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 @@
-34.68.144.114	1;
+35.192.85.2	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 ea117da9f..d9f0a2c04 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 @@
-34.68.144.114	0;
+35.192.85.2	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 f3e41611e..2f6a99041 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 b9d24324a..479de1217 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 @@
-34.68.144.114	1;
+35.192.85.2	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 ea117da9f..d9f0a2c04 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 @@
-34.68.144.114	0;
+35.192.85.2	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 f3e41611e..2f6a99041 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 b9d24324a..479de1217 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 @@
-34.68.144.114	1;
+35.192.85.2	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 ea117da9f..d9f0a2c04 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 @@
-34.68.144.114	0;
+35.192.85.2	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 f3e41611e..2f6a99041 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 6073098c1..acb73c006 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-34.66.178.120           0;
+35.202.145.110          0;
+35.188.1.99             0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index d98cdd814..592a28e3a 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 0a26465ca..5c6196d8d 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.188.73.34            0;
-34.66.178.120           0;
+35.184.226.236          0;
+35.202.145.110          0;
+35.184.96.71            0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index f3e41611e..2f6a99041 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 931904757..70f67e1ba 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,6 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-104.198.131.58          0;
-35.192.187.174          0;
-35.193.14.140           0;
+35.192.85.2             0;
+35.188.1.99             0;
+35.184.226.236          0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index f3e41611e..2f6a99041 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 0f27f0dd9..90fe4f9d3 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	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 349ec4bf1..a78983165 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 @@
-Buddy
-Dirbuster
-Foobot
-Siteimprove
-Sogou web spider
-Spinn3r
-WASALive-Bot
-WebBandit
-WebSauger
-Wprecon
+ASPSeek
+Disco
+GrabNet
+JamesBOT
+Mediatoolkitbot
+Suzuran
+TightTwatBot
+Upflow
+Voltron
+WebLeacher
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index f8fa98293..9b87eb75a 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
 Aboundex
+Aboundexbot
+Acunetix
 ADmantX
 AfD-Verbotsverfahren
+AiHitBot
+Aipbot
 Alexibot
-AllSubmitter
+AlphaBot
 Apexoo
 archive.org_bot
-autoemailspider
-Backlink-Ceck
+Asterias
+BackDoorBot
 backlink-check
-Badass
-Barkrowler
-BBBike
-BetaBot
+BackStreet
+Bandit
+BatchFTP
+Battleztar Bazinga
+BDCbot
+BDFetch
 Bitacle
-Blackboard
-BlackWidow
-Blow
+Black Hole
 Boardreader
 Bolt
+Buddy
 BuiltBotTough
 Bullseye
 CATExplorador
-CheeseBot
+CazoodleBot
 CherryPicker
+CheTeam
 ChinaClaw
+Chlooe
+Cliqzbot
+Cloud mapping
+coccocbot-web
 Cogentbot
-com.plumanalytics
+Copier
 CopyRightCheck
 Copyscape
 Cosmos
 Craftbot
-crawler4j
 crawler.feedback
-crawl.sogou.com
 CrazyWebCrawler
-Crescent
-CrunchBot
-Curious
-DatabaseDriverMysqli
-DataCha0s
+CSHttp
 Demon
-Devil
+Deusu
+Digincore
+DigitalPebble
+Dirbuster
 Disco
-Discoverybot
-DittoSpyder
+Discobot
+DnyzBot
 DomainCrawler
+DomainSigmaCrawler
 DomainStatsBot
-Dotbot
-Download Wonder
-Dragonfly
 Drip
-DSearch
 Ebingbong
-ECCP/1.0
-EMail Siphon
+eCatch
+Ecxi
+EMail Wolf
+EroCrawler
 evc-batch
 Exabot
 ExtLinksBot
 Extractor
 EyeNetIE
-Ezooms
-FDM
+facebookscraper
 FemtosearchBot
-FHscan
-FlashGet
-FyberSpider
+Firefox/7.0
+Flunky
 Genieo
-Getintent
-GetRight
+GetWeb
+Gigablast
+Gigabot
 G-i-g-a-b-o-t
-Gotit
-GoZilla
+Go-Ahead-Got-It
+Go!Zilla
 GrabNet
-GrapeshotCrawler
+GridBot
 GT::WWW
 Haansoft
-HTTP::Lite
+HaosouSpider
+Heritrix
+HMView
+HTMLparser
 Humanlinks
+HybridBot
 Iblog
-Id-search
 IlseBot
 IndeedBot
-Indy Library
-instabid
-JikeSpider
+InfoTekies
+Intelliseek
+InternetSeer
+ips-agent
+Iria
+Jbrofuzz
+Jetty
+Jorgee
 JustView
-Kozmosbot
-Larbin
+Kenjin Spider
+Lanshanbot
+LeechFTP
 LeechGet
-Lftp
+LexiBot
 LibWeb
-Libwhisker
-Lightspeedsystems
-Linkdexbot
-LinksManager
-LinqiaMetadataDownloaderBot
+Likse
+LinkextractorPro
+LinkScan
+LinkWalker
 LinqiaRSSBot
-Litemage_walker
-LNSpiderguy
+Lipperhey
 LWP::Simple
-Mag-Net
 magpie-crawler
-MarkWatch
-Masscan
+Majestic SEO
 Mata Hari
-MeanPath Bot
+MauiBot
+mediawords
+MegaIndex.ru
 Metauri
 MFC_Tear_Sample
-Microsoft URL Control
 MIDown tool
+Mister PiX
 MJ12bot
 Mojeek
-Morfeus Fucking Scanner
-Mr.4x3
 Msrabot
 MS Web Services Client Protocol
-Musobot
-Name Intelligence
-Nameprotect
-NetAnts
+Needle
 netEstate NE Crawler
-NetLyzer
-NetSpider
-Nettrack
+Net Vampire
+Netvibes
 NextGenSearchBot
-Nibbler
-Nikto
-oBot
+NICErsPRO
+Niki-bot
+NimbleCrawler
+Ninja
+Nmap
+Nutch
+Octopus
+Offline Explorer
+Offline Navigator
+OnCrawl
+Openfind
+OpenLinkProfiler
 OrangeBot
+OrangeSpider
 OutclicksBot
-PageGrabber
-page scorer
+PageAnalyzer
 PageScorer
 Panscient
-Papa Foto
-Pavuk
-PHPCrawl
+pcBrowser
+PECL::HTTP
+PeoplePal
 Picscout
-PictureFinder
 Pimonster
-PleaseCrawl
 plumanalytics
 Pockey
 Probethenet
-PxBroker
-QueryN Metasearch
+PyCurl
 Quick-Crawler
-RankFlex
+RankActive
 RankingBot
 RankingBot2
-RankurBot
 RebelMouse
 Recorder
 RedesScrapy
+ReGet
 RepoMonkey
-Ripper
-RocketCrawler
-Rogerbot
 ScanAlert
-ScoutJet
-Scrapy
-Screaming
+Scanbot
 ScreenerBot
-Searchestate
-SemrushBot
-SEOkicks
+Semrush
 SEOkicks-Robot
 SEOlyticsCrawler
-SEOstats
-serpstatbot
+SEOprofiler
 sexsearcher
-Shodan
-Siphon
+SISTRIX
 Sitebeam
+SiteExplorer
 SiteSnagger
-SiteSucker
 Site Sucker
+SlySearch
 SmartDownload
 SMTBot
-Snapbot
+Snake
 Snoopy
 Sociscraper
-sogouspider
-Sogou web spider
 Sosospider
+Sottopop
+SpaceBison
+Spammen
 SpankBot
-sp_auditbot
-Spbot
-spyfu
+Spinn3r
+Sqlmap
 Sqlworm
 Sqworm
+Sucker
+Sucuri
 Surfbot
+Suzuran
+Szukacz
+T0PHackTeam
+tAkeOut
+Telesoft
 The Intraformant
+TheNomad
 Thumbor
-TightTwatBot
-Titan
-Toata
 Toweyabot
 Tracemyfile
-Trendictionbot
-TurnitinBot
+Trendiction
+True_Robot
+Turnitin
+TwengaBot
+Twice
 Typhoeus
-UnisterBot
-Upflow
 URLy.Warning
-Vacuum
-Vagabondo
-VB Project
 VeriCiteCrawler
-WallpapersHD
-WBSearchBot
-WebAuto
-Web Auto
-WebBandit
-Web Collage
-WebCopier
-WEBDAV
+VidibleScraper
+Virusdie
+Voil
+Wallpapers/3.0
+WebCollage
 WebEnhancer
-Web Enhancer
 WebFetch
 Web Fetch
 WebGo IS
-WebImageCollector
-WebPix
+webmeup-crawler
 Web Pix
+WebReaper
 WebSauger
-WebsiteQuester
+Web Sauger
 WebSucker
-Web Sucker
 WebWhacker
 WeSEE
-Whacker
-Whatweb
-Who.is Bot
-WinHTTrack
+Whack
+Widow
 Wotbox
 Wprecon
 WPScan
 WWW-Collector-E
+WWW-Mechanize
+WWW::Mechanize
+WWWOFFLE
+x09Mozilla
 Xaldon WebSpider
-Xaldon_WebSpider
 xpymep1.exe
+Zauba
 zauba.io
-Zermelo
-Zeus
-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 2a87c4494..ec5fa17ea 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 @@
-404checker
+360Spider
+404enemy
+Abonti
+Aboundex
 Aboundexbot
-ADmantX
 AfD-Verbotsverfahren
 Aipbot
-Alexibot
-AllSubmitter
-Anarchie
-BackDoorBot
-backlink-check
+Apexoo
+archive.org_bot
+Attach
+Backlink-Ceck
 BackStreet
-BatchFTP
-Battleztar Bazinga
-BDFetch
-BetaBot
-Black Hole
+Badass
+Bandit
+BDCbot
 Boardreader
+Bolt
 Brandprotect
+Brandwatch
 Buddy
-BuzzSumo
+BuiltWith
+BunnySlippers
 CATExplorador
 CCBot
 Cegbfeieh
 CheeseBot
-CherryPicker
-CheTeam
 ChinaClaw
-Claritybot
+Chlooe
 Cliqzbot
-Cogentbot
-cognitiveseo
-Craftbot
-Crescent
+com.plumanalytics
+Copyscape
+crawler4j
+crawler.feedback
+crawl.sogou.com
+CrazyWebCrawler
+CrunchBot
+CSHttp
+DataCha0s
 DBLBot
 demandbase-bot
 Demon
-Digincore
+Deusu
+Devil
 DigitalPebble
-DIIbot
-Disco
-Dispatch
+Dirbuster
+Discobot
+Discoverybot
 DittoSpyder
-DomainCrawler
-Dragonfly
-DSearch
+DomainAppender
+DomainStatsBot
+Dotbot
+Download Wonder
+Ebingbong
 ECCP/1.0
-EMail Wolf
-evc-batch
-Express WebPictures
-Extreme Picture Finder
+EirGrabber
+Evil
+Exabot
+ExtractorPro
 EyeNetIE
 facebookscraper
 FDM
 FemtosearchBot
 FHscan
 Fimap
-FlashGet
-Foobot
-FrontPage
-Genieo
+FyberSpider
+GalaxyBot
 GermCrawler
-GetWeb
-Gigabot
-G-i-g-a-b-o-t
-GoZilla
-GrapeFX
-GridBot
+GetRight
+Gigablast
+Go-Ahead-Got-It
+Grabber
+Grafula
 GT::WWW
-Havij
-Heritrix
+Haansoft
+Harvest
 Hloader
-HMView
-HTMLparser
-HTTrack
+HTTP::Lite
 Iblog
+IlseBot
+Image Sucker
 Indy Library
-instabid
+InfoNaviRobot
 Intelliseek
 InterGET
 Internet Ninja
 ips-agent
 Iria
-IRLbot
 Iskanie
 IstellaBot
-JamesBOT
 Jbrofuzz
 JennyBot
-JikeSpider
-JustView
-Jyxobot
+JetCar
+Jetty
+JOC Web Spider
+Joomla
+Kenjin Spider
 Keyword Density
+Kozmosbot
 Lanshanbot
-LeechFTP
-LexiBot
-Lftp
-LibWeb
 Lightspeedsystems
 Linkdexbot
-LinkextractorPro
+LinksManager
 LinqiaMetadataDownloaderBot
 LinqiaRSSBot
+Lipperhey
 Lipperhey Spider
-Litemage_walker
 Lmspider
-Ltx71
-lwp-trivial
-Magnet
-Mag-Net
-magpie-crawler
+lwp-request
 Majestic12
-MarkMonitor
-Mata Hari
-MauiBot
+Majestic SEO
+Majestic-SEO
+MarkWatch
+Masscan
+Mass Downloader
+MeanPath Bot
 Mediatoolkitbot
+mediawords
 MegaIndex.ru
-MFC_Tear_Sample
+Metauri
 Microsoft Data Access
+MIIxpc
 Mister PiX
-Mojeek
+Mr.4x3
+MSFrontPage
 MSIECrawler
+Msrabot
 MS Web Services Client Protocol
-muhstik-scan
-Musobot
 Name Intelligence
 Nameprotect
-Navroad
 NearSite
-Nessus
-NetAnts
-Netcraft
-NetLyzer
+netEstate NE Crawler
 NetMechanic
+NetSpider
 Net Vampire
 Netvibes
-Nibbler
+NextGenSearchBot
 NICErsPRO
-Nimbostratus
 Ninja
 NPbot
 Nutch
-oBot
-Offline Explorer
+Octopus
 Offline Navigator
-OnCrawl
 OpenLinkProfiler
-OutfoxBot
-PageGrabber
+OpenVAS
+Page Analyzer
+page scorer
 Pandalytics
-Papa Foto
 pcBrowser
 PeoplePal
 Picsearch
+PictureFinder
 plumanalytics
-Pockey
 POE-Component-Client-HTTP
-PyCurl
+Probethenet
+PxBroker
 QueryN Metasearch
 Quick-Crawler
-RankActive
-RankingBot
-RebelMouse
-RedesScrapy
-ReGet
+RankingBot2
+RealDownload
+Recorder
 Ripper
-RocketCrawler
-s1z.ru
+Rogerbot
 SalesIntelligent
-SBIder
 scan.lol
 ScoutJet
-Screaming
-Searchestate
+Scrapy
 SearchmetricsBot
+Semrush
+SEOkicks-Robot
+SEOlyticsCrawler
+Seomoz
+seoscanners
+SeoSiteCheckup
+SEOstats
 serpstatbot
 sexsearcher
+Shodan
 Sitebeam
 SiteExplorer
 Siteimprove
-SiteSnagger
 SiteSucker
 Site Sucker
-Snoopy
-SocialRankIOBot
+SlySearch
+SMTBot
+Snake
 Sociscraper
+sogouspider
 Sogou web spider
-SpankBot
+Sosospider
+Sottopop
+Spanner
+sp_auditbot
 Spbot
 Spinn3r
-SputnikBot
 Sqlmap
-Sqworm
-Stripper
-Sucker
-Sucuri
-SuperBot
-SuperHTTP
+Steeler
+SurveyBot
 Suzuran
-Szukacz
+Swiftbot
+T0PHackTeam
+T8Abot
 Teleport
+Telesoft
 Telesphoreo
 Telesphorep
 The Intraformant
-Thumbor
+TightTwatBot
 Toata
+Toweyabot
+Tracemyfile
+Trendiction
+Trendictionbot
 trendiction.de
-Turingos
+True_Robot
 Turnitin
+TurnitinBot
 TwengaBot
+Twice
+UnisterBot
 URLy Warning
-URLy.Warning
+Vagabondo
 VeriCiteCrawler
-VidibleScraper
-Virusdie
 VoidEYE
+Voil
+Wallpapers/3.0
 WallpapersHD
-WASALive-Bot
-WBSearchBot
-Webalta
-WebAuto
 Web Auto
 WebBandit
-Web Enhancer
+WEBDAV
 WebFetch
 WebFuck
+WebGo IS
 WebImageCollector
-WebLeacher
+webmeup-crawler
+WebPix
 Web Sauger
-Webshag
-WebsiteExtractor
-WebsiteQuester
-WebStripper
 WebSucker
-Web Sucker
-WebWhacker
-WebZIP
-Who.is Bot
-WiseGuys Robot
-Wonderbot
+Widow
+WISENutbot
+Wotbox
 WPScan
 WWW-Collector-E
+WWW-Mechanize
+WWW::Mechanize
 WWWOFFLE
-x09Mozilla
-x22Mozilla
 Xaldon WebSpider
-Xaldon_WebSpider
-xpymep1.exe
-Zauba
-Zitebot
-ZumBot
+Zade
+zauba.io
+Zeus
+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 5be07cc79..2e4e3ad7f 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 @@
-adcash.com
-casinorewards.info
-compliance-willy.top
-gearsadspromo.club
-magicplayer-s.acestream.net
-myblogregistercm.tk
-poem-paying.gq
-priscilarodrigues.com.br
-superkanpo.com
-xedserver.com
+01apple.com
+202ch.com
+28n2gl3wfyb0.ru
+cheapbarbour.online
+elmifarhangi.com
+onthemarch.co
+refererx.com
+rentalcarnavi.info
+site-speed-checker.site
+udsgame.online
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 32a146110..0efbe1f04 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 @@
-00go.com
-0c47f8422d3f.com
-0n-line.tv
-1688.com
-1bet.com
-2girls1cup-free.com
+1001watch.com.ua
+11235813.webzdarma.cz
+1pamm.ru
+1qingdao.com
+2345.com
+24x7-server-support.site
+2drittel.de
 4k-player.pl
+4senses.co
 4ureyesonly.com
-76brighton.co.uk
-7a2rnuey1tw9ar.ru
-7fon.ru
-98oi.ru
-aa625d84f1587749c1ab011d6f269f7d64.com
-aa81bf391151884adfa3dd677e41f94be1.com
-aaronabel.com
-abclauncher.com
-abusora.com
-adclickthru.net
-addbin.men
-adimmix.com
-adloads.com
-adrunnr.com
-adservme.com
-adtology.com
-akuhni.by
-akvamaster.dp.ua
-alfa-img.com
-alfapro.ru
-allnews24.in
-allproblog.com
-allwomen.info
-amanda-porn.ga
-amigobulls.com
-ample-awards-today.us
-anal-acrobats.hol.es
-angigreene.com
-animal-drawings.com
-apilinkswiftco-a.akamaihd.net
-apimountainbikei-a.akamaihd.net
-app5.letmacworkfaster.world
-app-ready.xyz
-appsecurityr.com
-apxeo.info
-arvut.org
+5kstore.com
+5-steps-to-start-business.com
+999webdesign.com
+9icmzvn6.website
+aa9bd78f328a6a41279d0fad0a88df1901.com
+acortarurl.es
+activecampaign.dreamhosters.com
+add-add.men
+adelly.bg
+adultactioncam.com
+adultfriendfinder.com
+advocatemsk.ru
+advokateg.ru
+agardomains.com
+allforminecraft.ru
+alloysteel.ru
+amazon-seo-service.com
+amospalla.es
+anapa-inns.ru
+android-vsem.org
+angry-fermi-7633.arukascloud.io
+animaltoplist.com
+anonymizeme.pro
+apiallgeniusinfo-a.akamaihd.net
+apiappenableinfo-a.akamaihd.net
+apibatbrowsecom-a.akamaihd.net
+apiluckyleapnet-a.akamaihd.net
+apimossnetinfo-a.akamaihd.net
+arendakvartir.kz
+artavenuegardenstudios.com
+artpicso.com
+asdfz.pro
+asia-forum.ru
+asociatia-tipografilor-transilvania.ro
 astrochicks.com
-aussie-prizes.com
-australia-opening-times.com
-auto-zapchasti.org
-avtolombard-krasnodar.ru
-ayanaspa.com
-baditri.com
-bannerads.de
-bezlimitko.xyz
-bfz.biz
-big-boards.info
-bigpenisguide.com
-binomo.com
+atelielembrancaqueencanta.com.br
+atovh.local-finders.com
+auto4style.ru
+avek.ru
+aviapanda.ru
+b2b-lounge.com
+balkanfarma.ru
+baltgem.com
+banki76.ru
+bankofthewext.com
+bard-real.com.ua
+beachtoday.ru
+bedcapdealers.com
+berdasovivan.ru
+beremenyashka.com
+besthoro.ru
+best-mam.ru
+bestofpicture.com
+bestwaystogetpaid.us
+bet-prognoz.com
+bidr.trellian.com
+bigpictures.club
+bioca.org
+bioinnovate.co
 bitnote.co
 biznesrealnost.ru
+bizru.info
+blackle.com
 blobar.org
-bloggers.nl
-blogrankers.com
-bracketsmackdown.com
-braintobe.win
-brainxs.us
-brainzpod.win
-brandedleadgeneration.com
-brendbutik.ru
-brus.city
-buqyxa.rincian.info
-burkesales.com
-businesn.men
-buypanicdisorderpill.com
-buyviagraa.blogspot.com
-buzzsumo.com
-bvlgariring.xyz
+blog.remote-computer.de
+blogs.rediff.com
+bluejays-jerseys.us
+board.f00d.de
+bocoarchives.org
+bonzibuddi.com
+brainboostingsupplements.org
+bravegirlsclub.com
+brothers-smaller.ru
+buyk.host.sk
+buytizanidineonline.blogspot.com
+bvlgariwallet.xyz
+byme.se
+bytimedance.ru
 calcularpagerank.com
-call-of-duty.info
-callstevens.com
-canrole.com
+camdolls.com
+carapics.com
+cartierlove2u.com
+cartierreplica.pw
 cascadelink.org
-cdncash.com
-cheapjerseysbizwholesale.us
-chelyabinsk.xrus.org
-chocolateslim-original.com
-choosecuisine.com
-chorus.terakeet.com
-christianlouboutinreplica.win
-cialisndbrx.com
-cleanpcnow.com
-compliance-barak.xyz
-compliance-ivan.top
+caulderwoodkennels.com
+cheapmoncler.pw
+cheapmoncler.xyz
+christianlouboutinshoes.xyz
+cialischstgerts.com
+clayvasedesigns.tk
+cntravelre.com
+coindirect.io
+compiko.info
+compliance-alex.xyz
 compliance-jane.top
-compliance-john.top
-cornomase.win
-creams.makeforum.eu
-crynet.cc
-cryptoswap.biz
-cubook.supernew.org
-dailystrength.org
-datract.com
-datsun-do.com
-day-news.info
-delayreferat.ru
-deniven.1bb.ru
-deutschland123.de
-dev.citetick.com
-divku.ru
+compliance-julia.top
+comsysnet.com
+cookingmeat.ru
+copenergo.ru
+crest-poloski.ru
+crirussian.ru
+customcollegeessays.net
+customsua.com.ua
+cutalltheshit.com
+dataloading.net
+dating-app.ru
+ddlmega.net
+dealighted.com
+dellalimov.com
+delta-line.men
+deluxedumps.com
+deshevo-nedorogo.ru
+detective01.ru
+dickssportinggoods.com
+digest-project.ru
+discovertreasure-a.akamaihd.net
 dktr.ru
-dmmspy.com
-dojki-hd.com
-domznaniy.ru
-dotmass.top
-drugspowerstore.com
-dustyorate.com
-dvr.biz.ua
-easyukraine.com
-eduserver.net
-egvar.net
-ekspresihati.info
-elektrischezigaretten2.beeplog.com
-elite-sex-finders.com
-elkacentr.ru
-elmifarhangi.com
-emergencyneeds.org
-enge-fotzen.info
+dkvorota.ru
+dolohen.com
+domaincrawler.com
+domaineaneblanc.com
+domain-submit.info
+drivotracker.com
+drugs-no-rx.info
+drugstoreforyou.com
+duplicashapp.com
+easytuningshop.ru
+e-commerce-seo.com
+ecommerce-seo.com
+editmedios.com
+edudocs.net
+ee77ee.com
+ekosmetyki.net.pl
+ekto.ee
+eldiariodeguadalajara.com
+electronicadirect.com
+eleimgo.pw
+elektrozigarettekaufen1.devhub.com
+eluxer.net
+empathica.com
+empirepoker.com
+enews.tech
 eralph.tk
-espaceinventoristes.com
-eu-cookie-law.info
-eurosamodelki.ru
-excitacion.info
-expolicenciaslatam.co
-ezb.elvenmachine.com
-ezigarettekaufen.myblog.de
-f0815.de
-factorynightclub.com
-failingmarriege.blogspot.com
-familienzahnaerzte.com
-faracontrol.ir
-fba-mexico.com
-fealq.com
-fellowshipoftheminds.com
-fetishinside.com
-fitness-video.net
-fiuxy.com
-flytourisme.org
-forums.toucharcade.com
-fototravel.eu
+ero-advertising.com
+esfchat.tk
+european-torches.ru
+evening-dating-club.info
+exct.net
+exoneration-project.us
+eyes-on-you.ga
+ezigarettenshop1.yolasite.com
+ezofest.sk
+fashionavenuegame.com
+fashion-mk.net
+fastfixing.tech
+favoritemoney.ru
+feeriaclub.ru
+fetroshok.ru
+filerockstar298.weebly.com
+filmbokep69.com
+filmfanatic.com
+firstsiteguide.com
+floridamhca.org
+formulaantiuban.com
+forum-engineering.ru
+forum.tvmir.org
 frameimage.org
-free-deals.faith
-free-share-buttons.com
-free-share-buttons.top
-free-today.com
-freeuploader.ml
-freewlan.info
-funnymama.com
-fz139.ttk.ru
-game300.ru
-gamedayassist.com
-gamewrath.com
-gamingspark.com
-gateway.zscalerone.net
-gazporno.com
-gdcentre.ru
-geilehausfrauen.net
-generalporn.org
+free-fbook-traffic.com
+free-fb-traffic.com
+freenode.info
+froggytube.com
+frvo.alptandem.ru
+fuckingawesome.com
+fuck-paid-share-buttons.xyz
+fugarif.ga
+futbolkisales.ru
+galaxy-family.ru
+garciniaxt.us
+gardene.ru
+gazobeton-p.com.ua
+gazoblok.net.ua
+genericlowlatencyasiodriverhq.aircus.com
+genericviagrasildenafiled.net
 gepezz.info
-germes-trans.com
-getdot.ru
-getoutofdebtfree.org
-gifspics.com
-gk-atlant.info
-globalsurfari.com
-gobongo.info
-golmau.host.sk
+glall.ru
+glass-msk.ru
+globetrotting-culture.ru
+go2mike.ru
+goforexvps.com
+gojiberriess.apishops.ru
+good-mummy.ru
 googlemare.com
-gosmeb.ru
 gosreg.amchs.ru
-grand-chlen.ru
-gratuitxblcodes.com
-gsasearchengineranker.site
-gsasearchengineranker.space
-guruofcasino.com
-gwhwpxbw.bloger.index.hr
-hamilton.ca
-hdapp1008-a.akamaihd.net
-hdpixion.com
+greatgrace.ru
+gsou.cf
+gta-club.ru
+gta-top.ru
+gyffu.com
+habermetre.com
+hahashka.ru
+hd-filmy.net
+hdwalls.xyz
+hermesbirkinhandbagoutlets.com
+heroz.fr
+hesteel.pl
+high-speed1.net
 hildinghr.se
 himgaws.pw
-hitsbox.info
-hmywwogw.bloger.index.hr
-homemature.net
-horoshieokna.com
-hotelcrocenzi.sm
-houston-vikings.com
-hscsscotland.com
+hit-men.men
+hop.clickbank.net
+hopeonthestreet.co.uk
+housekuba.org
+howopen.ru
+hspline.com
 hubbble.com
 humanorightswatch.org
-ido3.com
-ilmexico.com
+ifirestarter.ru
+iinstalll-fii1leis.jus0wil.pp.ua
+ilmen.net
+images-graphics-pics.com
+imediadesk.com
+imfamous.info
+imicrovision.com
 importchinacoach-teach.com
-inboundlinks.win
-incanto.in.ua
-infazavr.ru
-insider.pro
+innodgfdriverhm.aircus.com
+instakink.com
+instasexyblog.com
+intellego.info
 invivo.hu
-ipchicken.com
-istizanidineanopiate.blogspot.com
-itch.io
-iusstf.org
-izismile.com
-jackpotchances.com
-janerikholst.se
-jav-fetish.site
-jerseyschinabizwholesale.us
-justucalling32211123456789.tk
-kabbalah-red-bracelets.com
-kakadu-interior.com.ua
-karting196.ru
-kazrent.com
-keki.info
-kemerovo.zrus.org
-keywords-monitoring-success.com
-keywordsuggest.org
-keywordteam.net
-kino-key.info
-kinosed.net
-kolotiloff.ru
-kongruan.com
-ks1234.com
-landreferat.ru
-laptop-4-less.com
-lerporn.info
-lifeinsurancekb.com
-liffa.ru
+io9.com
+iomoio.net
+iwanttodeliver.com
+jerseychinabizwholesale.com
+jetsli.de
+jumptap.com
+kam-dom.ru
+kasino-money.pw
+katjimej.blog.fc2.com
+kchaxton.com
+kerei.ru
+keywesthideaways.co
+kinomaniatv.pl
+kinoplen.ru
+kiwi237au.tk
+kmd-pto.ru
+kostenlos-sexvideos.com
+kotaku.com
+kredit-pod-zalog-krasnodar.ru
+kvartira-sutochno.com
+lapitec.eu
+larchik.net
+lasvegaslockandsafe.com
+lawyersinfo.org
+lazy-z.com
+le-clos-des-alouettes.com
+lennatin.info
+li-er.ru
+linkarena.com
 linkbux.ru
-linkdebrideur.xyz
-linksharingt.com
-lion.bolegapakistan.com
-littleberry.ru
-liveu.infoteka.hu
-lomb.co
-long-beach-air-conditioning.com
-lookingglassemb.com
-losangeles-ads.com
-lostaruban.com
-lostfilm-online.ru
-lowephotos.info
-lubetube.com
-luciddiagnostics.in
-macdamaged.space
-macfix.life
-mafa-free.com
-mainlinehobby.net
-makis.nu
-manimpotence.com
-mansparskats.com
-maridan.com.ua
-marmotstore.online
-masturbate.co.uk
-matrixalchemy.com
+liran-locks.com
+livefixer.com
+lomza.info
+louboutinshoes.xyz
+lovelycraftyhome.com
+malwareremovalcenter.com
+mantramusic.ru
+manyresultshub-a.akamaihd.net
+mapquestz.us
+massage-info.nl
+matpre.top
+matsdale.com
+m.b00kmarks.com
 medicinacom.ru
-meget.co.za
-message-warning.net
-mikozstop.com
-mindeyegames.com
-minecraft-rus.org
-mobplayer.net
-mobstarr.com
-moetomnenie.com
-moje-recenze.cz
-mokrayakiska.com
-monclerjacketsoutlet.pw
+medispainstitute.com.au
+meduza-consult.ru
+meetlocalchicks.com
+me-ke.com
+mensandals.xyz
+metascephe.com
+michaelkorsoutletstore.net
+microsoftportal.net
+missis.top
+mockupui.com
+modnie-futbolki.net
+moinozhki.com
 moncleronline.xyz
-moonci.ru
-mostantikor.ru
-moviezbonkerssk.cf
-mrcsa.com.au
-musirc.com
-muznachas-service.ru
+musezone.su
+muz-shoes.ru
 myanyone.net
-myhealthcare.com
-mystats.xyz
-na15.ru
-nac-bearings.ru
-nailsimg.com
-narkologiya-belgorod.ru
-narutonaruto.ru
-nastroyke.net
-natali-forex.com
-netallergy.ru
+mydownloadengine.com
+myplaycity.com
+nationalbreakdown.com
+nero-us.com
+net-profits.xyz
+newstaffadsshop.club
 nikitsyringedrivelg.pen.io
-nofreezingmac.work
-no-fuel.org
-november-lax.com
+nikkiewart.ru
+novatech.vn
+novodigs.com
+novosti-hi-tech.ru
 nullrefer.com
-nvssf.com
-o00.in
-obuv-kupit.ru
-odesproperty.com
-okel.co
-oklogistic.ru
+o333o.com
+offf.info
+of-ireland.info
 ok-ua.info
-oneminutesite.it
-online-podarki.com
-onthemarch.co
-openmediasoft.com
-open-odyssey.org
-orenburg-gsm.ru
-origin-my.ru
-osoznanie-narkotikam.net
-owohho.com
-panamaforbeginners.com
-panicatack.com
-parfusale.se
+olgacvetmet.com
+oneclickfiles.com
+onlineserialy.ru
+online-templatestore.com
+o-o-8-o-o.com
+o-o-8-o-o.ru
+osnova3.ru
+otbelivanie-zubov.com
+owathemes.com
+palvira.com.ua
+papasdelivery.ru
+paradontozanet.ru
 partner-pop.men
-peekyou.com
-pewit.pw
+paydayloanslocal.com
+percin.biz.ly
+perosan.com
 photorepair.ru
-piccdata.com
-picturesboss.com
-pixgood.com
-plaff-go.ru
-platesauto.com
-playfortuna-play.ru
-playtap.us
-pliks.pl
-pobeiranie.pl
-polimga.pw
-polybuild.ru
-popup-jdh.xyz
-porn555.com
-porndl.org
-porndroids.com
-pornofiljmi.com
-pornogad.com
-pornoklad.ru
-pornosmola.info
-porno-transsexuals.ru
+pinstake.com
+pinwallpaper.xyz
+pixelrz.com
+pizza-imperia.com
+pochtovyi-index.ru
+pogosh.com
+popunder.ru
+pornhive.org
+pornoblood.com
+portadd.men
+posible.net
 pospr.waw.pl
-pozdravleniya-c.ru
-priora-2.com
-privatov-zapisi.ru
-prize44.com
-prodvigator.ua
-prostitutki-tolyatti.org
-psvita.ru
-purchasepillsnorx.com
-quick-offer.com
-radiogambling.com
-rankia.com
-rapidokbrain.com
-rasteniya-vs-zombi.ru
-razyboard.com
-realnye-otzyvy.info
-reining.lovasszovetseg.hu
-relayblog.com
-remont-komputerov-notebook.ru
+pozdrawleniya.ru
+preparevideosafesystem4unow.site
+prizeestates.cricket
+prointer.net.ua
+prom23.ru
+pro-tec.kz
+qwesa.ru
+rada.ru
+radiodigital.co
+ragecash.com
+realtytimes.com
+redbottomheels.xyz
+rednise.com
 remote-dba.de
-rentaremotecomputer.com
-rezeptiblud.ru
-ribieiendom.no
-rimedia.org
-ritlweb.com
-robertefuller.com
-rosbalt.com.ua
-russkoe-zdorovie.ru
-rybalka-opt.ru
-salut-camp.ru
+repeatlogo.co.uk
+rniaeba.ga
+romhacking.ru
+rossanasaavedra.net
+royalvegascasino.com
+rozalli.com
+ruscoininvest.company
+rusexy.xyz
+sale-japan.com
+sa-live.com
+sammlungfotos.online
+samoiedo.it
+samo-soznanie.ru
 santechnik.jimdo.com
 sarafangel.ru
-saratov.xrus.org
-sarm.tk
-satellite.maps.ilovevitaly.com
+savememoney.co.za
+sawin.beth.webd.pl
+sayyoethe.blogspot.co.za
 sbtdesign.co.uk
-scanner-julianna.top
-scanner-mary.top
-scanner-willy.top
-scoopquest.com
-score-ads.men
-scripted.com
-seofirmreviewsus.info
-seorankinglinks.xyz
-seo-smm.kz
-service.adtech.fr
-sex-pr.net
+scanner-donald.top
+scanner-walt.top
+schoolfiles.net
+seansonline24.pl
+searchaddis.com
+search-error.com
+searchinquire.com
+searchlock.com
+semalt.com
+seo-prof1.xyz
+seo-tools-optimizing.com
+seo-traffic-ranking.info
+servisural.ru
+sex-foto.pw
+sexkrasivo.net
 sexs-foto.com
-shillyourcoins.com
-shoesonlinebuy.xyz
-shoplvlv.us
-shoppytoolmac.com
-sildenafil-tadalafil.info
-sisiynas.ru
-slavic-magic.ru
-slimcdn.com
-slkrm.ru
-social-fun.ru
-socialtrade.biz
-solmarket.by
-soserfis.com
-sotkal.lark.ru
-spasswelt.xyz
-spinnerco.ca
-sptslmtrafms.com
-spywareit.com
-spywarespy.com
-sstroy44.ru
-stackthatbucks.com
-stairliftstrue.com
-star61.de
-start.myplaycity.com
-staticfs.host
+sexstream.pl
+sexvporno.ru
+sex-watch.com
+shikiso.info
+sideeffectsoftizanidine.blogspot.com
+simon3.ru
+simple-share-buttons.com
+sim-service.net
+sims-sims.ru
+siteheart.net
+siteripz.net
+site-speed-check.site
+sizeplus.work
+sluganarodu.ru
+smartbalanceworld.com
+social-vestnik.ru
+songoo.wz.cz
+space2019.top
+spravka130.ru
+statoutlook.info
+stickers-market.ru
 strag-invest.ru
-strangeduckfilms.com
-support.nopeas.sk
-surintech.ac.th
-sweepstakes.rewardit.com
-sygraem.com
-talant-factory.ru
-technopellet.gr
-tedy.su
-telesvoboda.ru
-thaisamkok.com
-themeforest.net
-tizanidine4mgtablets.blogspot.com
-tizanidinecost.blogspot.com
-top10-way.com
-top-karkas.ru
-topmira.com
-totu.us
-toursmaps.com
-toyota.7zap.com
-trahic.ru
-trainoffend.ml
-tri-slona.org
-trkdf.com
-tupper-posuda.ru
-turizm.bz
-tvnewsclips.info
-tvoystartup.ru
-umekana.ru
-unisexjewelry.org
-unmaroll.ya.ru
+stretchingabuckblog.com
+stroyhelp-dv.ru
+stroyplus.ru
+sumo.com
+superkanpo.com
+suture.co
+swsociety.se
+t3chtonic.com
+takeflyte.com
+tattomedia.com
+teastory.co
+teslathemes.com
+textads.men
+thegioixekhach.com
+thejournal.ru
+tizanidineandcipro.blogspot.com
+tizanidinedosage.blogspot.com
+tizanidineforopiatewithdrawal.blogspot.com
+tizanidinehcl2mgtablet.blogspot.com
+tizanidinehcl4mgtab.blogspot.com
+tizanidineshowupondrugtest.blogspot.com
+tkanorganizma.ru
+todohr.com
+top10registrycleaners.com
+topkarkas.com
+topsy.com
+torrent-to-magnet.com
+torrnada.ru
+tpu.ru
+track2.shop
+trackmedia101.com
+traffmonster.info
+tripper.de
+tsan.net
+turist-strani.ru
+uasb.ru
+umg-stroy.ru
+univerfiles.com
+uptime-alpha.net
 urccvfmc.bloger.index.hr
-urdoot.win
-urengoy.pro
-uroffer.link
-us-america.ru
-vacances-voyages.info
-vandrie-ict.nl
-vasileostrovsky-rayon.ru
+usadacha.net
+usiad.net
+ussearche.cf
+valkiria-tk.ru
 vegan-foods.us
-viagroid.ru
-videochat.cafe
-video-chat.love
-videosbox.ru
-vipms.ru
-vipsexfinders.com
-vkonche.com
-vladhistory.com
-voloomoney.com
-voluumtrk.com
-vonradio.com
-voronezh.xrus.org
-vostoktrade.info
-vtc.pw
-wanker.us
-watchmyfb.pl
-waterefficiency.co
-waysbetter.cn
-we-are-gamers.com
+vektorpress.ru
+videochat.bz
+videokrik.net
+videospornogratisx.net
+videotuber.ru
+villacoloniale.com
+vozbujdenie.com
+vpnmouse.com
+vrotike.ru
+vysigy.su
+vzlom-na-zakaz.com
+w7s.ru
+wallpapers-best.com
+watchinf.com
+wdfdocando.com
 webpromotion.ae
-websiteaccountant.de
-website-speed-checker.site
-weclipart.com
-weekes.biz.tc
-wemarketing.se
-wetgames.ru
-whereverdesperate.gq
-wingsofrefuge.net
-wowcasinoonline.ooo
-wsgames.ru
-xchangetrak.com
-x-diesel.biz
-x-diesel.org
+westum.se
+westvilletowingservices.co.za
+wnoz.de
+wrona.it
+www.arenda-yeisk.ru
+xbaboon.com
+xev.ru
+xkaz.org
+xlolitka.com
+xn----7sbahjd3btneuw1joc.xn--p1ai
+xn--80aanaardaperhcem4a6i.com
+xn--b1agm2d.net
+yaaknaa.info
+yogamatsexpert.com
 yoshkarola.zrus.org
-youghbould.wordpress.com
-youraticles.pl
-yourdesires.ru
-yourserverisdown.com
-yurgorod.ru
-zeg-distribution.com
+yunque.pluto.ro
+zambini.ru
+zarepta.com
 zeroredirect7.com
-zigarettenonlinekaufen1.blox.pl
-zigarettenonlinekaufen2.drupalgardens.com
-zkjovpdgxivg.ga
-zlatnajesen.com
-zoogdisany.com
-zoompegs.com
-zvezdagedon.ru
+zigarettenonlinekaufen.tumblr.com
+zocaparj.kz
+zolotoy-lis.ru
+zrizvtrnpale.tk
+zx6.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 29f49ef47..dcba56647 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 @@
-00it.com
-1-99seo.com
-51unlim.ru
-aad1f4acb0a373420d9b0c4202d38d94fa.com
-abctoppictures.net
-abiente.ru
-abwa.tk
-adconscious.com
-adhome.biz
-advancedsoftwaresupport.com
-adventureparkcostarica.com
-aerogo.com
-agapovdg.ru
-agardomains.com
-alborzan.com
-alphahoverboards.com
-amospalla.es
+28n2gl3wfyb0.ru
+3rbseyes.com
+55wmz.ru
+above.com
+addtoadd.men
+adexprts.com
+adinterax.com
+adman.gr
+a.frcls.fr
+alldezservice.kz
+all-streaming-media.com
+amigobulls.com
 anal-acrobats.com
-apibetweenlinesn-a.akamaihd.net
-apioutoboxnet-a.akamaihd.net
-aramaicmedia.org
-asacopaco.tk
-asrv-a.akamaihd.net
-availit.weebly.com
-azazaporn.com
+apartamentwroclaw.eu
+apartmentbay.ru
+apibatbrowsecom-a.akamaihd.net
+apidigidocketnet-a.akamaihd.net
+appiq.mobi
+arenda-yeisk.ru
+atley.eu.pn
+autogrep.ru
+autotop.com.ua
 bankcrediti.ru
-battleforupdating.site
-begalka.xyz
-belinka.com.ua
-bestfortraders.com
-bet365.com
-betterhdporn.com
-bigpenisguide.com
-blog-hits.com
-boc.kz
-boostmyppc.com
-brains2.biz
-brainsandeggs.blogspot.com
-buketeg.xyz
-buyhoverboard.com
-bycontext.com
-californianews.cf
-callawaygolfstore.online
-candy-glam-hp.com
-capacitacionyaprendizaje.com
-cardiosport.com.ua
-carfax.com.ua
-cartierlovestore.com
-cbox.ws
-c-gainsbourg.com
-cherrypointplace.ca
-cjmc.info
-clarithromycin500mg.com
-clickaider.com
-clicksor.com
-compliance-jack.top
-consorzioilmosaico.org
-cookie-law-enforcement-ff.xyz
-coop-gamers.ru
-crest-poloski.ru
-crynet.cc
-crystalslot.com
-d0t.ru
-dating-app.ru
-d-black.bz
-dengi-pod-zalog-nedvizhimosti.ru
-dev-seo.blog
-dinkolove.ya.ru
-dogbreedspicture.net
-dojki-hd.com
-domik-derevne.ru
-dosugrostov.site
-draniki.org
-duplicashapp.com
-ekaterinburg.xrus.org
-elektronischezi.livejournal.com
-elvenar.com
-encodable.com
-enternet.ee
-everflora.ru
-executehosting.com
-extlabs.io
-eyessurgery.ru
-ezigarettenshop2.myblog.de
-facecup.top
-family1st.ca
-fitnesspiks.com
-fodelsedagspresenter.nu
-folowsite.com
-f-online.de
-forodvd.com
-freejabs.com
-futbolkisales.ru
-galaxy-family.ru
-gambarkatabaru.com
-gazoblok.net.ua
-get-seo-domain.com
-gettpromos.com
-gheus.altervista.org
-glall.ru
+bfz.biz
+bjorkbacken.nu
+bmw.afora.ru
+bookmark4you.com.biz
+buchananshardware.com
+buehne-fuer-menschenrechte.de
+bumskontakte.org
+burn-fat.ga
+buypuppies.ca
+bzero1jewelry.net
+callcafe.info
+call-of-duty.info
+canvas.gloverid.site
+carson.getenjoyment.net
+casablancamanor.co.za
+cashkitten-a.akamaihd.net
+cheapbelstaff.online
+checktext.org
+christianlouboutinreplica.pw
+christianlouboutinreplica.win
+click2pawn.com
+clickprotects.com
+clicksor.net
+coaching-netz.info
+cobaltpro.ru
+codq.info
+collegerentals.com
+compliance-andrew.xyz
+compliance-ivan.top
+compliance-josh.top
+cookie-law-enforcement-hh.xyz
+customchocolate.business-for-home.com
+customerguru.in
+cvety24.by
+cyclobenzaprinevstizanidine.blogspot.com
+cyse.tk
+dataloading.net
+dekorkeramik.ru
+devochki.top
+dneprsvet.com.ua
+dogclothing.store
+dogoimage.com
+doktoronline.no
+domaincdn.xyz
+domcran.net
+educatemetv.com
+edudocs.net
+ee77ee.com
+electronicadirect.com
+elitepcgames.com
+en.altezza.travel
+engines-usa.com
+epicbrogaming.com
+excaliburfilms.com
+exdocsfiles.com
+extremepornos.net
+fanpagerobot.com
+findthe.pet
+fishtauto.ru
+free-share-buttons.blogspot.com
+freshwallpapers.info
+fxtips.ru
+galaxys6manual.info
+gcup.ru
+ge0ip.com
+gearsadspromo.club
+gilsonchiro.xyz
 goldandcard.ru
-googlefeud.com
-googlemare.com
-graphicwe.org
-grupografico-pilar.com.ar
-hexpilot.com
-houdom.net
-housekuba.org
-houseofrose.com
-ifirestarter.ru
-iflycapetown.co.za
-i-hobot.ru
-inmate-locator.us
-intellekt21.ru
-itis4you.com
-iwanttodeliver.com
-javatex.co.id
-juliaworld.net
-katadhin.co
+goroda-vsego-mira.ru
+greatfind-a.akamaihd.net
+greenidesign.co
+gribkovye-zabolevaniya.com
+gsasearchengineranker.site
+gwebtools.com.br
+gz2.bbsoldes.fr
+healing-dysplasia.ru
+hentai-manga.porn
+histats.com
+historichometeam.com
+hotloans.ru
+hptwaakw.blog.fc2.com
+hystersister.com
+iamsport.org
+iideaidekonkatu.info
+ilovevitaly.ru
+iminent.com
+imk.com.ua
+import-sales.com
+incanto.in.ua
+inclk.com
+iopeninghours.co.uk
+ipostroika.ru
+it-max.com.ua
+jestr.org
+job.icivil.ir
+kartiniresto.com
 katjimej.blog.fc2.com
-kaz.kz
-kino-ecran.ru
-kollekcioner.ru
-kutikomi.net
-labafydjxa.su
-laudit.ru
-laulini.soclog.se
-lechtaczka.net
-losangeles-ads.com
-machicon-akihabara.info
-magazintiande.ru
-manyresultshub-a.akamaihd.net
+khafre.us
+kichenaid.ru
+knowsitall.info
+konturkrasoty.ru
+lalalove.ru
+law-check-eight.xyz
+lignofix.ua
+likesuccess.com
+linkdebrideur.xyz
+lkbennettoutlet.online
+loadopia.com
+lomza.info
+long-beach-air-conditioning.com
+m3gadownload.pl
+mackeeper-center.club
+mahnwachen-helfen.info
+mainlinehobby.net
 maranbrinfo.com.br
-marmitaco.cat
-matb3aa.com
-maxthon.com
-meble-bogart.info
-mecash.ru
-med-zdorovie.com.ua
-methodsmarketing.com
-microsoftportal.net
-midst.eu
-militarysale.pro
-mirtorrent.net
-mjchamonix.org
-mmoguider.ru
-mnogolok.info
-mobstarr.com
-mouselink.co
-movies-in-theaters.net
-muz-baza.net
-mydoctorok.ru
-mygameplus.ru
-narkologiya-orel.ru
-netanalytics.xyz
-ningessaybe.me
-nippon-bearings.ru
-nottyu.xyz
-officedocuments.net
-office-windows.ru
-okayimage.com
-onclickpredictiv.com
-onemantrip.com
-online247.ml
-o-o-6-o-o.com
-panouri-solare-acoperis.com
+markjaybeefractal.com
+masthopehomes.com
+maxxtor.eu
+mcnamaratech.com
+medosmotr-ufa.ru
+minyetki.ru
+mlf.hordo.win
+moesen-ficken.com
+moivestiy.biz
+moncleroutletonline.xyz
+moneytop.ru
+moneyzzz.ru
+most.gov.iq
+musicspire.online
+mydeathspace.com
+mystats.xyz
+naj-filmy24.pl
+news-readers.ru
+nfljerseyscheapbiz.us
+notasprensa.info
+november-lax.com
+novosibirsk.xrus.org
+nudepatch.net
+offer.wpsecurity.website
+okuos.com
+olvanto.ru
+ooomeru.ru
+openstat.com
+pandroid.co
 partner-pop.men
-pdn-4.com
-pepperstyle.ru
-picquery.com
-pipki.r.acdnpro.com
-pobeiranie.pl
-pojdelo.weebly.com
-pornoforadult.com
-professionalwritingservices15.blogspot.ru
-psoriasis-file.trade
+partner-print.men
+partners-ship.pro
+pensplan.com
+pic2fly.com
+piratecams.com
+pkr1hand.com
+plastgranar.nu
+plastweb.ru
+ploenjitmedia.azurewebsites.net
+pomoc-drogowa.cba.pl
+pornmania.pl
+pornolook.net
+pornosee.info
+positive2b.ru
+progonrumarket.ru
+prohoster.info
+propranolol40mg.blogspot.com
 py100.ru
-pyrodesigns.com.au
-rankingchart.de
-rcpmda.ikan1080.xyz
-realnye-otzyvy.info
-rentalcarnavi.info
-rostov.xrus.org
-rvi.biz
-sabizonline.com
-searchwebknow-a.akamaihd.net
-seksotur.ru
-seoholding.com
-service-core.ru
-shtora66.ru
-sildenafilcitratemed.com
-sizeplus.work
-sledstvie-veli.net
-solitaire-game.ru
-soochi.co
-space2019.top
-spb.afora.ru
-spylog.com
-statoutlook.info
-strag-invest.ru
-stroiminsk.org
-strv.se
-summerlinhomes411.info
-sundrugstore.com
-supermama.top
-template-kid.com
-tgtclick.com
-tizanidineformigraines.blogspot.com
-tizanidinehcl2mg.blogspot.com
-tonerbox.kz
-truck-rece.life
+reelheroes.net
+registrydomainservices.com
+research.ifmo.ru
+rewardit.com
+ru-dety.ru
+russian-postindex.ru
+saitevpatorii.com
+saletool.ru
+sampleletters.net
+screentoolkit.com
+searchtooknow-a.akamaihd.net
+seoheap.com
+shama-rc.net
+shoppytoolmac.com
+siteaero.com
+sitevaluation.org
+stairliftstrue.com
+staticfs.host
+stockspmb.info
+stroilka.info
+symphonyintegratedhealthcare.com
+tackletarts.co
+tastyfoodideas.com
+thedownloadfromwarez.blogspot.com
+theheroes.ru
+tiandeural.ru
+time-japan.ru
+tizanidineandcipro.blogspot.com
+tizanidineusedfor.blogspot.com
+top-deal.com.pl
+topsiteminecraft.com
 tsstcorpcddvdwshbbdriverfb.aircus.com
-tuberkulezanet.ru
-ucoz.ru
-udsgame.online
+u17795.netangels.ru
+uac.net.au
+uchetunet.su
 unece.org
-upproar.com
-ural-buldozer.ru
-urdoot.win
-urengoy.pro
-urzedowski.eu
-vacuumscleaner.com
-video-chat.cn
-video-woman.com
-villakohlanta.nu
-vitoriacabos.com
-vrnelectro.ru
-vzlom-na-zakaz.com
-webinstantservice.com
-welck.octopis.com
-white-truck.life
-windowssearch-exp.com
-wingsofrefuge.net
-wygraj-skiny.win
-xblog.in
-xmronta.com
-xn--80aikhbrhr.net
-xn--b1ag5cfn.xn--p1ai
-xn--h1aakne2ba.xn--p1ai
-xnxx-n.com
-x-porno.video
-x-rates.ru
-yellowfootprints.com
-yoshkarola.zrus.org
-yourmovies.pl
-yourothersite.com
-youtoner.it
-zakon-ob-obrazovanii.ru
-zapiszto.pl
-zeroredirect6.com
+vinylvault.co.uk
+vipms.ru
+voluumtracker1.com
+vote-up.ru
+vsdshnik.com
+waterpurifier.club
+webenlace.com.ar
+webshoppermac.com
+wedding0venues.tk
+wedding-salon.net
+weightatraining.com
+whatistizanidine2mg.blogspot.com
+wordpress-crew.net
+wwwadultcheck.com
+xaylapdiendanang.com
+xn----7sbbahaq9bb5afgiqfliv4m.xn--p1ai
+xn--80aaafbn2bc2ahdfrfkln6l.xn--p1ai
+xn--80aaajbdbddwj2alwjieei2afr3v.xn--p1ai
+xn--80ahdheogk5l.xn--p1ai
+xn----9sbubg3ambdfl1j.xn--p1ai
+xxxtubesafari.com
+yaoguangdj.com
+yhit.press
+yougame.biz
+youradexchange.com
+youtube-downloader.savetubevideo.com
+za-fun-offer.com
+znakomstva-moskva77.ru
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index a7215fb74..f371d9e5f 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,11 +1,21 @@
-<html>
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
+</html><html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.14.2</center>
 </body>
 </html>
-l>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -116,14 +126,4 @@ l>
 <h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
 <p>This is merely used for testing !!!</p>
 </body>
-</html><!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to NginX</title>
-</head>
-<body>
-<div align=center>
-<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
-<p>This is merely used for testing !!!</p>
-</body>
 </html>
\ No newline at end of file
diff --git a/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index 0e0848852..bc389ee32 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-104.154.113.151	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 55e0cfe95..8fd474ee3 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 7049e35d2..c2e3d0bc2 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 dcb8e6d22..2f1be9707 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1718
+#### Version: V4.2019.07.1720
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index d943217c8..e73045c8b 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1718
+#### Version: V4.2019.07.1720
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index b2af1e8f7..5a39a2482 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.1718
+#### Version: V4.2019.07.1720
 #### Bad Referrer Count: 6717
 #### Bad Bot Count: 556
 ____________________
diff --git a/_google_analytics_ghost_spam/README.md b/_google_analytics_ghost_spam/README.md
index 5803eb883..e81a52ce7 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.1718
+#### Version: V4.2019.07.1720
 #### 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 f3e41611e..2f6a99041 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.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 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 ce6c05325..209f53c06 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.1718
-### Updated: Mon Jul  1 13:21:39 SAST 2019
+### Version: V3.2019.07.1720
+### Updated: Mon Jul  1 14:31:32 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index f3e41611e..2f6a99041 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1718
-### Updated: Mon Jul  1 13:21:38 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:30 SAST 2019
 ### Bad Referrer Count: 6717
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index 4e6dd3d84..7593f541a 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1718
-### Updated: Mon Jul  1 13:21:41 SAST 2019
+### Version: V4.2019.07.1720
+### Updated: Mon Jul  1 14:31:33 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##