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 58acf0a1d..30a5b9007 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.245.105	1;
+104.197.122.201	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 a69bef7d4..c31c197b9 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.245.105	0;
+104.197.122.201	0;
 127.0.0.1	0;
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 58acf0a1d..30a5b9007 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.245.105	1;
+104.197.122.201	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 a69bef7d4..c31c197b9 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.245.105	0;
+104.197.122.201	0;
 127.0.0.1	0;
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 58acf0a1d..30a5b9007 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.245.105	1;
+104.197.122.201	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 a69bef7d4..c31c197b9 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.245.105	0;
+104.197.122.201	0;
 127.0.0.1	0;
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index b3b5be12a..1ee07d5dc 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2021.06.2437
-### Updated: Mon Jun 21 14:55:25 SAST 2021
+### Version: V3.2021.06.2438
+### Updated: Mon Jun 21 15:32:21 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index ed5f43106..58342486f 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
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 26bb5ecb7..37407911b 100644
--- a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +45,4 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-34.66.50.208            0;
+35.192.91.101           0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index ed5f43106..58342486f 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
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 87dc4782a..58acf0a1d 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	1;
+35.202.245.105	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 a5f544ae0..a69bef7d4 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	0;
+35.202.245.105	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 ed5f43106..58342486f 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
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 87dc4782a..58acf0a1d 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	1;
+35.202.245.105	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 a5f544ae0..a69bef7d4 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	0;
+35.202.245.105	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 ed5f43106..58342486f 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
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 87dc4782a..58acf0a1d 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	1;
+35.202.245.105	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 a5f544ae0..a69bef7d4 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	0;
+35.202.245.105	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 ed5f43106..58342486f 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
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 707b0313b..6b7e34e66 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
-34.66.50.208            0;
-34.66.25.221            0;
+34.66.200.49            0;
+104.197.122.201         0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index 72ffce573..39d25ccd8 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
diff --git a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
index 33d268f92..3094f666a 100644
--- a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-104.197.122.201         0;
-34.66.50.208            0;
+35.202.245.105          0;
+35.188.15.155           0;
diff --git a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
index 883fd408a..e79721f84 100644
--- a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
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 403a63ce9..62dc34c93 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,6 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-104.197.122.201         0;
-35.192.10.37            0;
+35.188.15.155           0;
 34.66.25.221            0;
+104.197.122.201         0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index ed5f43106..58342486f 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
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 a44308926..6a9aec045 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
+35.192.10.37            0;
+35.202.245.105          0;
 35.192.91.101           0;
-34.66.200.49            0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index ed5f43106..58342486f 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 58acf0a1d..30a5b9007 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.202.245.105	1;
+104.197.122.201	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 88bf1952e..6b7b545b3 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 @@
-DIIbot
-G-i-g-a-b-o-t
-IDBot
-Mister PiX
-NextGenSearchBot
-Searchestate
-SentiBot
-Spinn3r
-Turingos
-Web Collage
+Aspiegel
+crawler.feedback
+FDM
+IDBTE4M
+Jbrofuzz
+POE-Component-Client-HTTP
+SpaceBison
+WebPix
+WebReaper
+ZmEu
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index 4694cff0d..ce7879f5a 100644
--- a/.dev-tools/test_units/random-bots-for-test.list
+++ b/.dev-tools/test_units/random-bots-for-test.list
@@ -1,250 +1,250 @@
-404checker
+01h4x.com
+360Spider
 404enemy
-80legs
+Abonti
 Aboundexbot
+AfD-Verbotsverfahren
 AhrefsBot
-AIBOT
-Aipbot
-Alligator
+AiHitBot
 AllSubmitter
-AlphaBot
+Anarchy99
 Ankit
+Anthill
+Apexoo
 archive.org_bot
-arquivo.pt
+arquivo-web-crawler
 Aspiegel
 autoemailspider
-BackDoorBot
+AwarioSmartBot
+Backlink-Ceck
+backlink-check
+BacklinkCrawler
 BackStreet
 BackWeb
 Bandit
-BatchFTP
+Barkrowler
 Battleztar Bazinga
-Blackboard
+Bitacle
 BLEXBot
 Blow
+BlowFish
 Boardreader
-Brandprotect
-Buddy
+Bolt
+BotALot
+Buck
 BuiltBotTough
-Bullseye
-BuzzSumo
-CATExplorador
 CazoodleBot
-CensysInspect
+CCBot
 CheeseBot
-CherryPicker
-Chlooe
 Claritybot
-coccocbot-web
+Cliqzbot
+Cocolyzebot
+CODE87
 cognitiveseo
+Collector
 Copier
-Craftbot
-crawler4j
-crawl.sogou.com
-CrazyWebCrawler
-CSHttp
+CopyRightCheck
+Crescent
+Curious
+Custo
 CyotekWebCopy
 DatabaseDriverMysqli
 demandbase-bot
+Digincore
 DIIbot
-Discobot
-Discoverybot
-DnyzBot
+Dirbuster
+DomainAppender
+DomainCrawler
+DomainSigmaCrawler
+DomainStatsBot
 DomCopBot
 Dotbot
 Download Wonder
-Dragonfly
-Drip
-EirGrabber
+DTS Agent
+EasyDL
+eCatch
+ECCP/1.0
+Ecxi
 EMail Siphon
 EMail Wolf
-evc-batch
-Evil
-Express WebPictures
 ExtractorPro
 Extreme Picture Finder
 EyeNetIE
-Ezooms
-FDM
 FemtosearchBot
-Firefox/7.0
-FlashGet
-Foobot
+FHscan
 Freeuploader
 Fuzz
-GetWeb
-G-i-g-a-b-o-t
-Grabber
+FyberSpider
+GalaxyBot
+Genieo
+GermCrawler
+GetRight
+Go-Ahead-Got-It
+gopher
+Gotit
+Go!Zilla
 GrabNet
+Grafula
 GrapeFX
 GrapeshotCrawler
-GridBot
-GT::WWW
 Haansoft
-Havij
+HaosouSpider
+HEADMasterSEO
 heritrix
-Heritrix
-Hloader
-HTMLparser
-HTTP::Lite
 HTTrack
-Indy Library
+IDBot
+Id-search
+Image Fetch
 InfoNaviRobot
-InfoTekies
-Internet Ninja
+instabid
+InternetSeer
+ips-agent
 Iria
-IRLbot
 isitwp.com
-Joomla
-Jorgee
+Iskanie
+JikeSpider
+JustView
+Kenjin Spider
 Keyword Density
 Kinza
+Kozmosbot
 LeechFTP
+LeechGet
 LexiBot
 Lftp
 Libwhisker
-Lightspeedsystems
-Likse
 Linkbot
-LinkextractorPro
+Linkdexbot
+LinkScan
 LinkWalker
-LinqiaRSSBot
-LinqiaScrapeBot
-Lmspider
-LNSpiderguy
+Lipperhey
+Lipperhey Spider
 Ltx71
-LWP::Simple
-lwp-trivial
 Magnet
-Mag-Net
+magpie-crawler
+Majestic12
 MarkWatch
-Masscan
 Mass Downloader
+Mata Hari
 MauiBot
-Mb2345Browser
-Meanpathbot
-MeanPath Bot
-Mediatoolkitbot
-mediawords
-Metauri
-MFC_Tear_Sample
-Microsoft URL Control
 MIIxpc
+Mister PiX
+MJ12bot
 Moblie Safari
-Mojeek
-Musobot
+Mojolicious
+Mozlila
+MQQBrowser
+muhstik-scan
 Nameprotect
-Navroad
 Needle
-NetMechanic
-Netvibes
-NetZIP
-Nikto
-Ninja
+NetLyzer
+NetSpider
+Net Vampire
+NextGenSearchBot
 Nmap
+NPbot
 Nuclei
 Nutch
-Octopus
-Offline Navigator
+oBot
+Offline Explorer
 OnCrawl
+Openfind
 OpenLinkProfiler
-Openvas
+OpenVAS
+OPPO A33
 OrangeBot
+OutfoxBot
 PageAnalyzer
-PageScorer
+page scorer
 PageThing.com
+Panscient
+Pavuk
 pcBrowser
-PECL::HTTP
-PeoplePal
-Petalbot
+Picscout
+Picsearch
 PictureFinder
 Piepmatz
+Pi-Monster
+plumanalytics
 Pockey
-Probethenet
-ProPowerBot
-Psbot
-Pump
-PxBroker
-QueryN Metasearch
-Quick-Crawler
-RankFlex
+POE-Component-Client-HTTP
+ProWebWalker
 Rankivabot
 RealDownload
 Reaper
 RebelMouse
-Recorder
-RepoMonkey
+Ripper
 RocketCrawler
+Rogerbot
+RSSingBot
+s1z.ru
+SalesIntelligent
 SBIder
+scalaj-http
+ScanAlert
 Scanbot
-ScreenerBot
+Scrapy
+Screaming
 ScrepyBot
-Searchestate
 Semrush
+SentiBot
 SeobilityBot
+SEOkicks
 SEOkicks-Robot
+SEOlyticsCrawler
+Seomoz
+seoscanners
 SeoSiteCheckup
-seostar
 Siphon
 SISTRIX
 Sitebeam
+SiteCheckerBotCrawler
+SiteExplorer
+SiteSnagger
 Snake
 Snapbot
-Sociscraper
-sogouspider
-Sottopop
-SpaceBison
-SputnikBot
+Snoopy
+Sogou web spider
 spyfu
+Sqlworm
 Sqworm
-Steeler
-Stripper
-Sucker
-Sucuri
 SuperBot
-Surfbot
 SurveyBot
-T0PHackTeam
-T8Abot
-Teleport
-TeleportPro
-TheNomad
-Thumbor
-Toata
-Tracemyfile
-trendiction.com
+Suzuran
+Swiftbot
+sysscan
+The Intraformant
+Titan
+Trendiction
 trendiction.de
 True_Robot
+Turingos
 Typhoeus
+UnisterBot
 URLy.Warning
-V-BOT
-VB Project
-VCI
-VoidEYE
-Web Auto
+Vagabondo
+VelenPublicWebCrawler
+voyagerx.com
+WebAuto
+Web Collage
 WebCopier
-WebEnhancer
 WebFetch
-Web Fuck
-WebImageCollector
+WebLeacher
 webmeup-crawler
-WebReaper
+Web Pix
 WebSauger
-WebsiteExtractor
+Web Sauger
 Website Quester
+Webster
 WebSucker
-WebWhacker
-WebZIP
-WeSEE
 Whack
-Whatweb
-WinHTTrack
-WPScan
+Widow
+Wotbox
+WWW-Mechanize
 WWWOFFLE
-x09Mozilla
-Xaldon WebSpider
-Zade
-Zermelo
-ZoomBot
-ZoominfoBot
-ZyBorg
+x22Mozilla
+Xenu
+YoudaoBot
+Zeus
+zgrab
+ZmEu
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index 659201603..612a312ab 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 @@
-01h4x.com
 360Spider
-Aboundexbot
-AfD-Verbotsverfahren
-Alligator
+Abonti
+Aboundex
+ADmantX
+AiHitBot
+Aipbot
+Alexibot
+AllSubmitter
+AlphaBot
 Anarchie
+Anarchy
 Anarchy99
 Apexoo
-archive.org_bot
-arquivo.pt
 arquivo-web-crawler
-ASPSeek
-Attach
+Asterias
 autoemailspider
+AwarioSmartBot
 BackDoorBot
-backlink-check
-BacklinkCrawler
-BackWeb
-Badass
+Backlink-Ceck
 Bandit
+Barkrowler
 Battleztar Bazinga
+BDFetch
+BetaBot
+Bitacle
 Blackboard
 Black Hole
+BlackWidow
+Blow
 Bolt
-BotALot
 BuiltBotTough
 Bullseye
-CATExplorador
+BuzzSumo
+Calculon
+CCBot
+CensysInspect
+check1.exe
+Chlooe
+Claritybot
 Cliqzbot
-coccocbot-web
-Cocolyzebot
-cognitiveseo
-Collector
-com.plumanalytics
+Copier
 Cosmos
-CrunchBot
-DBLBot
-Demon
-Deusu
-Devil
-Dirbuster
+CSHttp
+demandbase-bot
+DIIbot
 Discobot
 Discoverybot
 Dispatch
 DnyzBot
-DomainAppender
-DomainCrawler
-DSearch
+Domains Project
+DomainStatsBot
+DomCopBot
+Download Wonder
+Dragonfly
 DTS Agent
-EasyDL
-EMail Siphon
-EMail Wolf
+ECCP/1.0
 EroCrawler
 Exabot
 Express WebPictures
-ExtLinksBot
-Extractor
 ExtractorPro
+EyeNetIE
 facebookscraper
-FemtosearchBot
-Firefox/7.0
+Fimap
+FlashGet
 Flunky
-FyberSpider
+Foobot
+FrontPage
 GalaxyBot
 GermCrawler
+GetRight
 Gigabot
-gopher
+Go!Zilla
+GrabNet
+GrapeFX
 GrapeshotCrawler
 GridBot
-GT::WWW
+Haansoft
+HaosouSpider
 Harvest
-Havij
 HEADMasterSEO
-Heritrix
-HMView
-Humanlinks
-HybridBot
-IDBot
+Hloader
+HTMLparser
+HTTP::Lite
+Iblog
+IDBTE4M
 Id-search
-IlseBot
 Indy Library
-instabid
+InfoNaviRobot
 Intelliseek
 Internet Ninja
-InternetSeer
+Iria
 isitwp.com
 Iskanie
 IstellaBot
-JennyBot
+Jetty
+JOC Web Spider
 Joomla
-JustView
-Jyxobot
 Kenjin Spider
-Keyword Density
-Kinza
-Kozmosbot
 Larbin
-LeechFTP
-LeechGet
-Lftp
+LexiBot
 Libwhisker
-LieBaoFast
-Linkbot
-Linkdexbot
+Likse
 LinkextractorPro
 LinksManager
-Lipperhey
-lwp-request
+LinqiaRSSBot
+LNSpiderguy
 LWP::Simple
-Mag-Net
-magpie-crawler
-Mail.RU_Bot
+lwp-trivial
 Majestic-SEO
-MarkMonitor
-Mass Downloader
-MauiBot
-meanpathbot
-Mediatoolkitbot
+MarkWatch
+MeanPath Bot
+mediawords
 MegaIndex.ru
-Microsoft Data Access
+Microsoft URL Control
+MIDown tool
 Mister PiX
 MJ12bot
 Moblie Safari
 Mojeek
 Morfeus Fucking Scanner
 Mozlila
-MQQBrowser
 Mr.4x3
-MSFrontPage
+MSIECrawler
+muhstik-scan
+Musobot
 Name Intelligence
 NearSite
-Nessus
+Needle
+NetAnts
 netEstate NE Crawler
-NetMechanic
+Netvibes
 NetZIP
 NextGenSearchBot
 Nikto
 NimbleCrawler
-NPbot
+Nimbostratus
+Ninja
+Octopus
 Offline Explorer
-OnCrawl
+Offline Navigator
 Openfind
-Openvas
-OrangeBot
-PageAnalyzer
+OPPO A33
+OutclicksBot
+OutfoxBot
+PageGrabber
+page scorer
+PageThing.com
 Pandalytics
 Papa Foto
-pcBrowser
-PeoplePal
+PECL::HTTP
 Petalbot
 PHPCrawl
-Picsearch
-Pi-Monster
-Pixray
 PleaseCrawl
-Pockey
-polaris version
-Probethenet
-ProPowerBot
+ProWebWalker
+Psbot
 Pu_iN
-PyCurl
+PxBroker
+QueryN Metasearch
+Quick-Crawler
+RankFlex
 RankingBot
+RankingBot2
 Rankivabot
 RankurBot
 RealDownload
-RebelMouse
-RedesScrapy
-Re-re
+RepoMonkey
 RocketCrawler
 RSSingBot
-s1z.ru
-satoristudio.net
+SalesIntelligent
+scalaj-http
 scan.lol
+ScoutJet
+Scrapy
+ScrepyBot
+Searchestate
 SearchmetricsBot
-SentiBot
-SeobilityBot
-SEOkicks
-SEOkicks-Robot
-seoscanners
-SeoSiteCheckup
+Semrush
 SEOstats
 serpstatbot
 sexsearcher
-Siphon
-SiteExplorer
-Siteimprove
+SiteLockSpider
 siteripz
+SiteSucker
+Sitevigil
+SmartDownload
 SMTBot
+Snake
 Snapbot
-SocialRankIOBot
-sogouspider
 Sogou web spider
 Sottopop
-Spbot
+SpaceBison
+Spammen
+SpankBot
+Spanner
+sp_auditbot
 SputnikBot
-Sqlworm
 Sqworm
 Steeler
-Stripper
 Sucker
 Sucuri
 SuperBot
 Surfbot
-Suzuran
+SurveyBot
+sysscan
+T0PHackTeam
+T8Abot
+tAkeOut
+TeleportPro
 Telesoft
 Telesphoreo
 TheNomad
 TightTwatBot
-Toata
-Tracemyfile
-Trendictionbot
-trendiction.com
-True_Robot
 Turingos
+Turnitin
+TwengaBot
+Twice
+URLy Warning
+Vacuum
 Vagabondo
+VCI
 VidibleScraper
 voyagerx.com
 Wallpapers/3.0
-WallpapersHD
-WebAuto
-Web Auto
+WBSearchBot
+WebCollage
 Web Collage
 WebCopier
-Web Enhancer
-WebFuck
-Web Fuck
+WEBDAV
 WebGo IS
-WebImageCollector
-webmeup-crawler
-WebReaper
-WebSauger
-WebsiteQuester
-WebStripper
-WebWhacker
+WebLeacher
+Webster
+WebSucker
+Web Sucker
+WebZIP
 WeSEE
-Whack
-Whatweb
-WinHTTrack
+Widow
 WiseGuys Robot
-WISENutbot
-Wprecon
-WWWOFFLE
-x09Mozilla
+Woobot
+Wotbox
+WWW-Collector-E
+WWW-Mechanize
 x22Mozilla
-Xaldon WebSpider
 Xaldon_WebSpider
+YoudaoBot
+Zauba
 Zeus
+zgrab
+Zitebot
 ZmEu
-ZoomBot
-ZumBot
+ZoominfoBot
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 304409e16..5789b5ce9 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 @@
-buyparajumpers.online
-dev33.dioniqlabb.se
-flex4launch.ru
-gosreg.amchs.ru
-kinoplen.ru
-mobplayer.net
-mosrif.ru
-paydayonlinecom.com
-tizanidineinteractions.blogspot.com
-zeroredirect8.com
+apimountainbikei-a.akamaihd.net
+iklysha.ml
+itis4you.com
+linkwithin.com
+mobile.ok.ru
+openmediasoft.com
+signx.info
+twiclub.in
+via-energy-acquistare.com
+vinylvault.co.uk
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 6009bfdd2..92aa14092 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 @@
-101raccoon.ru
-12masterov.com
-1xbet4you.com
-20pascals.nl
-2728fb936f0.com
-2nt.ru
-2x2fan.ru
-404.mn
-4k-player.pl
-4replicawatch.net
-7xc4n.com
-883zy.com
-aa625d84f1587749c1ab011d6f269f7d64.com
-add-add.men
-adloads.com
-admanaerofoil.com
-admitad.com
-adtech.us
-adultgalls.com
-advancedmassagebysara.com
-adzpower.com
-aerogo.com
-akuhni.by
-alert.scansafe.net
-alibestsale.com
-alice.it
-alphacarolinas.com
-ample-awards-today.us
-android-systems.ru
-animal-drawings.com
-apelsinnik.website
-apiallgeniusinfo-a.akamaihd.net
-apimountainbikei-a.akamaihd.net
-apiqualitinknet-a.akamaihd.net
-apiwoodensealcom-a.akamaihd.net
-ardimobileinfo.ml
-asscenihotosidea.blogspot.co.za
-audiofree.ru
-auspolice.com
-australia-opening-times.com
-autolombard-krasnodar.ru
-avtolombard-krasnodar.ru
-avto-oligarh.ru
-ayanaspa.com
-bag77.ru
-baladur.ru
-balkanfarma.org
-bamo.xsl.pt
-bannerspace.com
-bard-real.com.ua
-basedecor.ru
+1adult.com
+1-free-share-buttons.com
+273-fz.ru
+2girls1cup-free.com
+4istoshop.com
+4kplayer.pl
+51unlim.ru
+8gold.com
+aaa38852e886ac4af1a3cff9b47cab6272.com
+academia-nsk.org
+adconscious.com
+adidas.frwebs.fr
+adsfresh.men
+advocatemsk.ru
+adzerg.com
+aero2.ru
+agapovdg.ru
+ageofclones.com
+allmarketsnewdayli.gdn
+allwomen.info
+amazon-adsystem.com
+amazon-seo-service.com
+anal-acrobats.com
+apessay.com
+apidiamondatanet-a.akamaihd.net
+apparel-offer.com
+applicationg29.com
+appmsr.org
+arkartex.ru
+autonew.biz
+autotrends.today
+avitocars.ru
+avtocredit-legko.ru
+awaybird.ru
+awency.com
+ayeartoforget.com
+azartniy-bonus.com
+azazu.ru
+azbukafree.com
+baixar-musicas-gratis.com
+baksman.com
+baltgem.com
+bannertesting.com
 basisches-wasser.net
 bazaronline24.ru
-beauty-things.com
-begalka.xyz
-berdasovivan.ru
-bestcurs.org
-best-deals-products.com
-besthomemadepornsites.com
-best-seo-software.xyz
-bget.ru
-big-boards.info
-bimatoprost-careprost.com
-bingoporno.com
-biznesluxe.ru
-biznesrealnost.ru
-blackhatworth.com
-blackwitchcraft.ru
-bloglag.com
+beauty-b0x.pl
+beetpics.pw
+belinvestdom.by
+bestchoice.cf
+bestplacetobuyeriacta.jw.lt
+bestprofits-there.com
+best-way.men
+beztuberkuleza.ru
+bigcareer.info
+bigpenisguide.com
+biteg.xyz
+blog.koreadaily.com
+blog.remote-computer.de
+bmw-ark.ru
 bmwhighperformers.com
-braintobe.win
-breastaugmentation.co.za
-burger-imperia.com
-candlehandmade.com
-candytiner.com
-capture-room.com
-cartierlovestore.com
-casite-513049.cloudaccess.net
-castingbank.ru
-cete.ru
-cezartabac.ro
-changde.58.com
-cheapmarmot.online
-cheap-pills-norx.com
-cleanmypc.com
-clean-start.net
-click2pawn.com
-clickintext.net
-club-samodelkin.ru
-codysbbq.com
-coinsspb.com
-co.lumb.co
-contentlook.co
-cookingmeat.ru
+bnt-team.com
+bolezniorganov.ru
+bolitgorlo.net
+break-the-chains.com
+brothers-smaller.ru
+bryansk.zrus.org
+buigas.00it.com
+byme.se
+canrioloadm.gq
+cardsharp1.ru
+carina-sy.de
+cartechnic.ru
+cartierbracelet.xyz
+cartierreplica.xyz
+cartiertrinity.xyz
+casinos4dummies.co.uk
+cdncash.net
+cementaresearch.se
+chatseo.com
+cheapjerseysfootballshop.com
+choosecuisine.com
+christianlouboutinreplica.win
+cialgenisrx.com
+clayvasedesigns.tk
+clevernt.com
+clickbanksites.info
+clickpapa.com
+clipartnew.com
+clippingphotoindia.com
+cobaltpro.ru
+cocolyze.com
+codq.info
+coin-hive.com
+cometorussia.net
+compliance-elena.top
 coop-gamers.ru
-cowlmash.com
+copenergo.ru
+counterbot.com
+covadhosting.biz
+cs-passion.pl
 customcatchcan.com
-customchocolate.business-for-home.com
-daneshetabiat.com
-ddlmega.net
-demenageur.com
+cyclobenzaprinevstizanidine.blogspot.com
+dailystrength.org
+darmebel.com.ua
+dear-diary.ru
+defenderxtactical.com
+dellalimov.com
+deluxedumps.com
 descargar-musica-gratis.net
-design-lands.ru
-dieta-personalna.pl
-digilander.libero.it
+dev78.dioniqlabb.se
+dieswaene.com
+dimfour.com
+directrev.com
 dollartree.info
-domination.ml
-doxysexy.com
-dptaughtme.com
-druzhbany.ru
-dumpsmania24.com
-duplicashapp.com
-eandsgallery.com
-e-avon.ru
+domain.webkeyit.com
+dominateforex.ml
+donvito.unas.cz
+dood.live
+downloader12.ru
+download-of-the-warez.blogspot.com
+dpihatinh.gov.vn
+drugs-no-rx.info
+druzhininevgeniy63.blogspot.com
+dustyorate.com
+dvd-famille.com
+dvervmoskvu.ru
+dynainbox.com
+earn-from-articles.com
 ecxtracking.com
-educontest.net
-eets.net
-ekto.ee
-elektroniksigaraankara.info
-elkacentr.ru
-eloconcream.blogspot.com
-eshop.md
-everypony.ru
-evidencecleanergold.com
-exoneration-project.us
-exonline.info
-ezigarettekaufen2.yolasite.com
-familienzahnaerzte.com
-fanrto.com
-fapgon.com
-fbdownloader.com
-fertilitetsradgivningen.se
-fikasound.tk
-filmetricsasia.com
-fitfloponline.store
-fitness-video.net
-fivedwld.cf
-flex4launch.ru
-floating-share-buttons.com
-flowersbazar.com
-flowwwers.com
-forum.tvmir.org
-franch.info
-freegamesplay.online
-free-social-buttons.com
-freshmac.space
-frustrated-favorable.gq
-fuel-gas.com
-funtoonez.com
-fxtips.ru
-fym.com.ru
-fyxabomiw.ru
-gagrasector.ru
-gambarxkata.co
-gamerscorps.com
-gamezblox.com
-gaygalls.net
-gazoblok.net.ua
-geileweiber.tk
-generousdeal-a.akamaihd.net
-get-free-social-traffic.com
+eduinfosite.com
+ekosmetyki.net.pl
+eldiariodeguadalajara.com
+elektir.ru
+elektrozigarettekaufen1.devhub.com
+ertelecom.ru
+escort-russian.com
+estibot.com
+etm-consult.de
+extrabot.com
+ez8motelseaworldsandiego.com
+f012.de
+f07.de
+falopicm.pw
+favorcosmetics.com
+feel-planet.com
+findanysex.com
+findsexguide.com
+firstdrugmall.ru
+fix-website-errors.com
+flagcounter.me
+flash4fun.com
+foto-basa.com
+frameimage.org
+freakycheats.com
+free-floating-buttons.com
+freeseedsonline.com
+freewhatsappload.com
+front.ru
+fullfileaccess.com
+fusoradio.info
+g7m.pl
+galaxys6manual.info
+game-top.su
+gay.adultgalls.com
+gaytube.com
+getresponse.com
+getyourimage.club
+gg-arena.ru
+gifspics.com
 girlspicsa.com
-given2.com
-glicol.kz
-golaya.pw
+globalsurfari.com
+goforexvps.com
+goldandcard.ru
+golden-catalog.pro
+goldpanningtools.com
+golfresa.lucania.se
+gonextmedia.com
 goodwinmetals.co
-googleseo.com.tr
-gpirate.com
-gpms.org.my
-greenshop.su
-gwhwpxbw.bloger.index.hr
-gyffu.com
-hackers-crackers.tk
-hamptonoaks.ca
-hannasolution.ru
-hao123.com
-havepussy.com
+greendream.com.ua
+growmyfunds.ca
+grupografico-pilar.com.ar
+gsasearchenginerankerhelp.com
+handsandlegs.ru
+hatdc.org
 hdpixion.com
-hdwalls.xyz
-healing-dysplasia.ru
-help.tpu.ru
-hosting-tracker.com
-house.sieraddns.com
-houston-vikings.com
-hplaserjetpdriver8y.pen.io
-hundejo.com
-hunthillfarmtrust.org
-icaseclub.ru
-idealtits.net
-ifmo.ru
-iloveitaly.ru
-images.gyffu.com
-iminent.com
-imitex-plus.ru
-informatiecentro.be
-infostatsvc.com
-insider.pro
-instakink.com
-internet-apteka.ru
+health-medical-portal.info
+heliko.no
+heroz.fr
+hikesearch.net
+hjaoopoa.top
+hmywwogw.bloger.index.hr
+hoholikik.club
+hol.es
+host-tracker.com
+hotsocialz.com
+htmlcorner.com
+iframe-toloka.com
+ihtec2019.org
+iinstalll-fii1leis.jus0wil.pp.ua
+import-sales.com
+inbabes.sexushost.com
+infazavr.ru
+infektsii.com
+insurple.com
+intervsem.ru
+irkutsk.online-podarki.com
+ispac.org
+istizanidineanopiate.blogspot.com
 itch.io
-it-max.com.ua
-itrevolution.cf
-iwanttodeliver.com
-ixora.pro
-jasonpartington.com
-jeremyeaton.co
-jerseywholesalebizchina.com
-johnnyhaley.top
+ivanstroi.ru
+izhevsk.xrus.org
+izismile.com
+izoll.ru
+javxxx18.com
 joingames.org
-junglenet-a.akamaihd.net
-jwss.cc
-jyrxd.com
-kalandranis.gr
-karachev-city.ru
-kashubadesign.ru
-kazka.ru
-khafre.us
-kino-ecran.ru
-kinotorka.ru
+junketjuice.blogspot.com
+kadashihotel.com
+kaliningrad.zrus.org
+kambasoft.com
+kandidos.com
+kartiniresto.com
+keywordglobal.co.za
+keywords-monitoring-your-success.com
+keywordsuggest.org
+kinky-fetishes.com
+kinoflux.net
 kiskinhouse.com
-klikbonus.com
-klosetkitten.com
-kongruan.com
-kosynka-games.ru
-ks1234.com
-kvartira-sutochno.com
-kvartir-remont.biz
-lasvegaslockandsafe.com
-laulini.soclog.se
+klejonka.info
+klumba55.ru
+komputernaya-pomosh-moscow.ru
+konpax.com
+kosova.de
+kuzinsp.ru
+lapolis.it
 lazy-z.com
+leboard.ru
+leftofcentrist.com
+lenvred.org
 lescinq.com
-letolove.ru
-libertybilisim.com
-lignofix.ua
-limtu.ifmo.ru
-linkbolic.com
-littleberry.ru
-lmrauction.com
-loadingpages.me
-locationdesaison.com
-lombia.com
-lomza.info
-lonerangergames.com
-m1media.net
-mabdoola.blogspot.com
-mafcards.ru
-magento-crew.net
-mailemedicinals.com
-manifestation.betteroffers.review
-manipulyator-peterburg.ru
-matb3aa.com
-maxthon.com
-mbiologi.ru
-mebelcomplekt.ru
-medkritika.ru
-megagrabber.ru
-merryhouse.co.uk
-metabar.ru
-middlerush-a.akamaihd.net
-mielec.pl
-milblueprint.com
-minyetki.ru
-mixed-wrestling.ru
-monclervests.xyz
-money-every-day.com
-monitorwebsitespeed.com
+life-instyle.com
+lineshops.biz
+linkrr.com
+lion.misba.us
+llastbuy.ru
+lostfilm-online.ru
+louboutinshoes.xyz
+lowephotos.info
+lrac.info
+lsex.xyz
+lsp-awak-perikanan.com
+lubetube.com
+lyrster.com
+macdamaged.space
+maglid.ru
+maju.bluesalt.co
+managerpak204.weebly.com
+manuscript.su
+matrixalchemy.com
+mature.free-websites.com
+meccadumps.net
+meet-flirt-dating.com
+menhealed.net
+methodsmarketing.com
+midst.eu
+mil-stak.com
+misswell.net
+mistr-x.org
+mlf.hordo.win
+mnimmigrantrights.net
+mobioffertrck.com
+monthlywinners.com
+moroccosurfadventures.com
+moyakuhnia.ru
+mrpornogratis.xxx
+mug-na-chas-moscow.ru
 musezone.ru
-my-bc.ru
+musezone.su
+muzaporn.com
+mxgetcode.com
+mycaf.it
 mycouponizemac.com
-myfreemp3.eu
-myftpupload.com
 myprintscreen.com
-najaden.no
-newfilmsonline.ru
-newstraveller.ru
-newyorkhotelsmotels.info
-nextconseil.com
+myyour.eu
+nalogovyy-kodeks.ru
+narco24.me
+nationalbreakdown.com
+negral.pluto.ro
+net-profits.xyz
+networkad.net
+nevansk.ru
+new-apps.ru
+nhl09.ru
 nibbler.silktide.com
-nikhilbahl.com
-northfacestore.online
-offer.wpsecurity.website
-office-windows.ru
-oklogistic.ru
-one.net.in
-onlinewritingjobs17.blogspot.ru
-ons-add.men
-o-o-8-o-o.com
-openfrost.net
-open-odyssey.org
-oralsexfilme.net
-outpersonals.com
+niki-mlt.ru
+novodigs.com
+nullrefer.com
+nvformula.ru
+oconto.ru
+offers.bycontext.com
+officedocuments.net
+okuos.com
+olvanto.ru
+onclkads.com
+onko-24.com
+onlinetvseries.me
+o-o-6-o-o.ru
+oranga.host.sk
+orgasmatrix.com
+ourville.info
+owathemes.com
+ownshop.cf
 pagesense.com
-paidonlinesites.com
-par-fallen.ga
-partnerline.men
-pendelprognos.se
-photokitchendesign.com
-php-market.ru
+palvira.com.ua
+pammik.ru
+partner-trustworthy.men
+pc-services.ru
+pc-virus-d0l92j2.pw
 picmoonco.pw
 picphotos.net
-picsearch.com
-pills24h.com
-pinapchik.com
-pintattoos.com
-pixgood.com
-pix-hd.com
-playfortuna-play.ru
-play-mp3.com
-pl-vouchers.com
-pod-muzyku.club
-pogruztehnik.ru
-pojdelo.weebly.com
-pons-presse.com
-popunder.ru
+picturesify.com
+piluli.info
+piuminiita.com
+pix24x7.com
+pl.id-forex.com
+plugingeorgia.com
+pony-business.com
 pornhub-ru.com
-pornoblood.com
+porno-chaman.info
 pornoplen.com
-pornowarp.info
-portside.cc
-posible.net
-postclass.com
-preconnubial.usuby.site
-privacyassistant.net
-privatamateure.com
-producm.ru
-profitsport.club
-profitwithalex.info
-prohoster.info
-promgirldresses.xyz
-prostitutki-tyumeni.org
-pro-tec.kz
-ptr.ruvds.com
-pts163.ru
-pulseonclick.com
-qcstrtvt.bloger.index.hr
-quickchange.cc
-randalljhoward.com
-ranksays.com
-rankscanner.com
-rapidokbrain.com
-razorweb-a.akamaihd.net
-realting-moscow.ru
-regionshop.biz
-registry-cleaner.net
-remontvsamare.su
-rique.host.sk
-riralmolamsaca.tk
-rocketchange.ru
-roma-kukareku.livejournal.com
-roznica.com.ua
-rukino.org
-rusexy.xyz
-safe-app.net
-saitevpatorii.com
-sakhboard.ru
-sanidumps.com
-sarf3omlat.com
+porno-raskazy.ru
+pornoted.com
+porno-transsexuals.ru
+pornotubexxx.name
+pornzone.tv
+princeadvantagesales.com
+privatov-zapisi.ru
+prombudpostach.com.ua
+proposal-engine.com
+pukaporn.com
+putevka24.ru
+qld10000.net
+quickbuck.com
+rankingchart.de
+ranksonic.info
+ranksonic.org
+realnye-otzyvy.info
+registrydomainservices.com
+registrysweeper.com
+reimageplus.com
+rewardit.com
+reward-survey.net
+ribieiendom.no
+roll123.com
+rucrypt.com
+ruscopybook.com
+russian-postindex.ru
+russia-today-video.ru
+sady-urala.ru
+sale-japan.com
+saletool.ru
+samo-soznanie.ru
+saneitconsulting.com
+santasgift.ml
 sarm.tk
-satoristudio.net
-sbwealthsolutions.ca
-scanmarine.info
-seccioncontrabajo.com
+saugatuck.com
+scanmyphones.com
+scoopquest.com
+scopich.com
+scrapy.org
+sdelai-prosto.ru
+seadragonherbery.com
+searchkut.com
+searchtooknow-a.akamaihd.net
+seminarygeorgia59.ga
 sendearnings.com
-seogadget.ru
-seorankinglinks.us
-sex-foto.pw
-sexfreepornoxxx.com
-sexiporno.net
-sexpornotales.com
-sex-tracker.com
-sextracker.com
-shariki-zuma-lines.ru
-shitmovs.com
+seo-prof1.xyz
+seorussian.ru
+servethis.com
+service.adtech.us
+serving.adbetclickin.pink
+sexgalleries.top
+sexuria.net
+sfj-ror.no
+s-forum.biz
+shisha-swag.de
+shitting.pro
+shmetall.com.ua
 shodanhq.com
-shoppytoolmac.com
-simplesite.com
-simply.net
-simpoed.ufop.br
-site5.com
-skutecznetabletkinaporostwlosow.pl
+siteexpress.co.il
+sitevalued.com
+sitopreferito.it
+sky-mine.ru
+skyway24.ru
+slavia.info
 slomm.ru
-snyatie-lomki-v-stacionare.ru
-sobecjvuwa.com.ru
-soc-econom-problems.ru
-socialbuttons.xyz
-socialmadesimple.com
+soaksoak.ru
 socialmediasuggest.com
-social-search.me
-social-s-ggg.xyz
-social-vestnik.ru
-soc-proof.su
-softomix.net
-spasswelt.xyz
-spb-plitka.ru
-spidtest.org
-srdrvp.com
-ssconstruction.co
-startufa.ru
-stockspmb.info
-streetfooduncovered.com
-sugarlyflex.pw
-sygraem.com
-takeflyte.com
-tampabaywatch.org
-tarad.com
-td-33.ru
+softtor.com
+soheavyblog.com
+sohoindia.net
+sotkal.lark.ru
+spabali.org
+speeddream.xyz
+spinnerco.ca
+spitfiremusic.com
+spymac.net
+stromerrealty.com
+survival.betteroffers.review
+susanholtphotography.com
+suture.co
+swimpool.ca
+swsociety.se
+tacbibirfa.tk
+tagil.zrus.org
+taqywu51.soup.io
 tecspb.ru
-telegramdownload10.com
 telsis.com
-testingads.pro
-thaisamkok.com
+terrafootwear.us
 thecoolimages.net
-thejournal.ru
-theplacetoupdating.pw
-thepokertimer.com
-tizanidine4mgstreetvalue.blogspot.com
-tizanidinefibromyalgia.blogspot.com
-tizanidinehcl4mgtabinfo.blogspot.com
-tmtrck.com
-tomatis.gospartner.com
-tomck.com
-tonerbox.kz
-topads.men
-topdownloads.ru
-trkdf.com
+theheroes.ru
+thewebsitetemplate.info
+ticketsys.inetwd.com
+tizanidinedosageforsleep.blogspot.com
+tizanidinestreetprice.blogspot.com
+toolsky.com
+topkarkas.com
+traderzplanet.in
+trafficmp.com
+traffictrade.life
 truck-rece.life
-tubeline.biz
-tula.howotorg.ru
-twelvevisionspartyofcolorado.com
-typer.one
-unblocksit.es
-unitexindia.com
-unrealcommander.com
+tuckpointingmasonrysystems.com
+turbo-suslik.org
+turizm.bz
+ucsol.ru
+uhod-za-sobakoj.ru
+ukrtvir.com.ua
+umekana.ru
+univerfiles.com
 uptime-alpha.net
-urll.eu
-usbggettwku.ga
-userequip.com
-vavilone.com
-veerotech.com
-viagra.pp.ua
-videojam.tv
-vilingstore.net
-villacoloniale.com
-vita.com.hr
-viveresaniesnelli.it
-vladhistory.com
-vltai.com
-vostoktrade.info
-vrotike.ru
-vvon.co.uk
-vysigy.su
-w3javascript.com
-wallpapers-best.com
-watchmygf.net
-webads.co.nz
-webcamdevochka.com
-webpromotion.ae
-website-analyzer.info
-webstatsdomain.org
-welck.octopis.com
-whatsupinfoley.com
-whatzmyip.net
-whiteelephantwellington.com
-wholesalejerseychinashop.com
-wholesalejerseys-cheapest.com
-wholesalejerseysgaa.com
-wildnatureimages.com
-w-journal.ru
-woman-orgasm.ru
+usdx.us
+vadimkravtcov.ru
+validdomain.xyz
+vclicks.net
+veselokloun.ru
+vgoloveboli.net
+videochat.ph
+vip2ch.com
+virtualbb.com
+vitalads.net
+vizag.kharkov.ua
+vksex.ru
+voronezh.xrus.org
+vseuznaem.com
+vvpg.ru
+wait3sec.org
+warezaccess.com
+watchmyfb.pl
+waycash.net
+web-betting.ru
+webjam.com
+website-audit.com.ua
+weightatraining.com
+whatsappdownload10.com
+wholesalejerseyscheapjerseys.us.com
+wieseversa.no
+winwotgold.pl
+wleuaprpxuvr.ga
 wordpress-crew.net
-wormix-cheats.ru
-wstroika.ru
-wttavern.com
-www.888.com
-xaylapdiendanang.com
-xchat26.myfreecams.com
-x-diesel.info
-xjlottery.com
-xn-----6kcaacnblni5c5bicdpcmficy.xn--p1ai
-xn--80aodinpgi.xn--p1ai
-xn--b1agm2d.net
-x-stars.ru
-xxart.ru
-xxxasianporn.net
-xxxnatelefon.ru
-yebocasino.co.za
-yellowproxy.net
-yottos.com
-za-fun-offer.com
-zaimhelp.ru
-zarabiaj-dzis.pl
-zarenica.net
-zatjmuzu.info
-zeikopay.com
-zigarettenonlinekaufen1.bloog.pl
-znakom.sibtest.ru
-zone-kev717.info
-zoompegs.com
-zvuker.net
-zygophyceous.womanstars.site
+worldoffiles.ru
+www.souvenirua.com
+www.wohnkabinen-shop.de
+wygraj-skiny.win
+xcombear.ru
+xgftnlrt.bloger.index.hr
+xn------7cdbapdecfd4ak1bn0amjffj7afu3y.xn--p1ai
+xn--80aeahghtf8ac5i.xn--p1ai
+xn----8sbhefaln6acifdaon5c6f4axh.xn--p1ai
+xn----9sbubg3ambdfl1j.xn--p1ai
+xn----ctbigni3aj4h.xn--p1ai
+xn--e1aggki3c.xn--80adxhks
+xn--h1ahbi.com.ua
+xnxx-n.com
+xxxtube69.com
+xz618.com
+xzlive.com
+yes-com.com
+youandcredit.ru
+youtube-downloader.savetubevideo.com
+yunque.pluto.ro
+zaidia.xhost.ro
+zajm-zalog-krasnodar.ru
+zakonobosago.ru
+zhacker.net
+zmoda.hostreo.com
+znakomstva-piter78.ru
+zona-aqua.ru
+zootravel.com
+zrelaya.pw
+zvetki.ru
+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 5f808b8ac..7e1d907f1 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 @@
-03p.info
-108shot.com
-34.gs
-3dracergames.com
-3w24.com
-76brighton.co.uk
-7a2rnuey1tw9ar.ru
-aab94f698f36684c5a852a2ef272e031bb.com
-aadroid.net
-aaronabel.com
-acgs.tk
-add-add.men
-adtech.de
-adultfriendfinder.com
-affordablewebsitesandmobileapps.com
-ageofclones.com
-ahhjf.com
-allknow.info
-anal-acrobats.com
-analytics-ads.xyz
+0lovespells0.blogspot.com
+123kuma.com
+1314dh.com
+1flag.co.za
+51.la
+5tey7463.weebly.com
+actionnooz.com
+adloads.net
+adtology.com
+adultwebhosting.info
+advertex.info
+a.frcls.fr
+aihelen.net
+airlandsea.info
+akuhni.by
+alekseevec.ru
+alert.scansafe.net
+algarveglobal.com
+alldezservice.kz
+alyeskaresort.com
+amung.us
+anaseracresar.tk
 an-donut.com
-angry-fermi-7633.arukascloud.io
-apiportalmorecom-a.akamaihd.net
-asia-forum.ru
-asrvrep-a.akamaihd.net
-astana.xxxkaz.org
-automobile-spec.com
-azartmix.com
-babs.com.ua
-backlink4u.net
-balkanfarma.org
-bannerswap.com
-beachfix.co
-besthoro.ru
-besttorrentknifta.weebly.com
-bigpenisguide.com
-bloggers.nl
-blog.yam.com
-bristolhostel.com
-brokergid.ru
-buqayy0.livejournal.com
-buscarfoto.com
-business-made-fun.com
-buyclomidonlaine.com
-cactussoft.biz
-cardul.ru
-carsplate.com
-cb.iphantom.com
+anti-virus-removal.info
+apelsinnik.website
+approvedlocal.co.za
+apxeo.info
+arcteryxsale.online
+artdestshop.eu
+baladur.ru
+balans.shahterworld.org
+bang-hotties.com
+bannerads.de
+belinka.com.ua
+bestdooz.com
+bestempresas.es
+bio-japan.net
+bitcoinpile.com
+biteg.xyz
+bizzliving.com
+blackbabesporn.com
+brainzpod.win
+bscodecs.com
+buchananshardware.com
+buytizanidineonlinenoprescription.blogspot.com
+canacopegdl.com
+capacitacionyaprendizaje.com
+catalogs-parts.com
 ceotrk.com
-christianlouboutinsaleonline.us
-cicaki.net
-cleanallvirus.com
-clippingphotoindia.com
-clubfashionista.com
+cheapcigarettesc.info
+chelnytruck.ru
+clksite.com
+cmhomestayagency.com
 comeondog.info
-compliance-irvin.top
-cubook.supernew.org
-customcollegeessays.net
-daooda.com
-davebestdeals.com
-dekorkeramik.ru
-delfin-aqua.com.ua
-dellalimov.com
-den-noch24.ru
-detki-opt.ru
-detmebel.su
-discountbarbour.online
-distver.ru
-docs4all.com
-domainsatcost.com
-druzhininevgeniy63.blogspot.com
-earthmagic.info
-easyukraine.com
-editmedios.com
-eldiariodeguadalajara.com
-election.interferencer.ru
-eluxer.net
-eorogo.top
-eshop4u.jp
-essay-writing.work
-euronis-free.com
-ezigarettekaufen2.mpbloggar.se
-famix.xyz
-fickenprivat.info
-footbalive.org
-forex-procto.ru
-foxweber.com
-freejabs.com
-freeuploader.ml
-fz139.ttk.ru
-gallerylisting.com
-gearsadspromo.club
-gemgrab-a.akamaihd.net
-ghazel.ru
-goatse.ru
-gq-catalog.gq
-greatgrace.ru
-greendream.com.ua
-hetmanship.xyz
-historichometeam.com
-hotkeys.com
-hreade.com
-ikearugs.xyz
-imagui.eu
-impisr.edunsk.ru
-infokonkurs.ru
+compliance-george.xyz
+cosmeticswomens-womensports.rhcloud.com
+credit.co.ua
+credit-respect.ru
+cupday.com
+custom-electric-guitar.com
+cypernhuset.se
+decoratinghomes.ga
+delitime.info
+depositfiles-porn.ga
+detective01.ru
+dev33.dioniqlabb.se
+de.zapmeta.com
+digitalassetmanagement.site
+diminishedvalueoforegon.com
+dividendo.ru
+djonwatch.ru
+domaineaneblanc.com
+dustyorate.com
+e-buyeasy.com
+eets.net
+electro-prom.com
+elektir.ru
+embedle.com
+emerson-rus.ru
+empathica.com
+eredijovon.com
+es5.com
+event-tracking.com
+fenoyl.batcave.net
+fetishinside.com
+findanysex.com
+findsexguide.com
+findthe.pet
+flashahead.info
+floridamhca.org
+forum20.smailik.org
+forzeronly.com
+freevpn.space
+frivgame250.com
+fsalas.com
+gambarkatabaru.com
+games.kolossale.ru
+generousdeal-a.akamaihd.net
+gobongo.info
+gunsvicceadadebt.tk
+hahashka.ru
+hamacapty.com
+hannasolution.ru
+highspeed5.net
+hledejvshopech.cz
+hoverboard360.es
+https-legalrc.biz
+ido3.com
+igadgetsworld.com
+imperia31.ru
 infospot.pt
-insomniagamingfestival.com
-instasexyblog.com
-itag.pw
-jackwolfskinoutlet.online
-jjbabskoe.ru
-kakadu-interior.com.ua
-kashubadesign.ru
-katjimej.blog.fc2.com
-keki.info
-kemerovo.zrus.org
-kinomaniatv.pl
-kletkimehan.ru
-kol-energo.ru
-kolotiloff.ru
+infoupdate.org
+ivoiretechnocom.ci
+janerikholst.se
+japan-bearings.ru
+jerseysbizwholesalecheap.com
+jerseyschinabizwholesale.us
+job.icivil.ir
+jurajskie.info
+kerwinandcariza.com
+keywords-monitoring-your-success.com
+keywordteam.net
+kidd.reunionwatch.com
+kimcurlrvsms.com
+kinofak.net
+kinosed.net
+kinotorka.ru
+klitimg.pw
+kollesa.ru
+kurbappeal.info
 kvartir-remont.biz
-leadn.pl
-linerdrilling.com
-linksharingt.com
-lmrauction.com
-locustdesign.co
-low-format.ru
-m1media.net
-madot.onlinewebshop.net
-mainlinehobby.net
-manifestation.betteroffers.review
-mathgym.com.au
-mb140.ru
-megaapteka.ru
-meget.co.za
-member-quiz.com
-metallosajding.ru
-minet.club
-mojaocena.com
-monclercheap.xyz
-monetizer.com-01.site
-morocco-nomad-excursions.com
-mostantikor.ru
-moxo.com
-muschisexbilder.com
+lashstudia.ru
+lazy-z.com
+ledpolice.ru
+lion.bolegapakistan.com
+liverpool.gsofootball.com
+machicon-ueno.info
+manifestyourmillion.com
+manimpotence.com
+mansparskats.com
+medicovi.com
+meds-online24.com
+mejoresfotos.eu
+mmostrike.ru
+moroccosurfadventures.com
+moscow.online-podarki.com
+musicas.baixar-musicas-gratis.com
+muz-tracker.net
+mycouponizemac.com
+myindospace.com
+myonigroup.com
 myyour.eu
-naturtreenspicerx.pw
-nrjmobile.fr
-o333o.com
+narkologiya-orel.ru
+nastydollars.com
+nationalbreakdown.com
+nfljerseysforsalewholesaler.com
+nhl09.ru
+nicovideo.jp
+nsatc.net
+nuup.info
 obiavo.com
-ochistka-stokov.ru
-oconto.ru
-oecnhs.info
-onlinefilmz.net
-oralsexfilme.net
-osnova3.ru
-ostrovtaxi.ru
-pcgroup.com.uy
-piluli.info
-pintattoos.com
-popunder.ru
-pornofiljmi.com
-pornokorol.com
+okmedia.sk
+onlyporno.ru
+partner-host.men
+pearlisland.ru
+pihl.se
+platesauto.com
+platezhka.net
+play.leadzupc.com
+podshipniki-nsk.ru
+poptool.net
 porno-play.net
-positive2b.ru
-preparevideosafesystem4unow.site
-printie.com
-privatov-zapisi.ru
-prize44.com
-pro-poly.ru
-prostitutki-astana.org
-pufip.com
-puserving.com
-pwwysydh.com
-py100.ru
-rapidsites.pro
-referencemoi.com
-resultshub-a.akamaihd.net
+primedice.com
+prom23.ru
+prostitutki-odessa.org
+puzo2arbuza.ru
+qld10000.net
+realmonte.net
+registry-cleaner.net
+remmling.de
+renecaovilla.online
+rentaremotecomputer.com
 ros-ctm.ru
-royal-investments.net
-ruspdd.com
-russkie-gorki.ru
-salutmontreal.com
-scanner-jessica.top
-scanner-julia.top
-seofirmreviewsus.info
-servicecenter.co.ua
-se-welding.ru
-shariki-zuma-lines.ru
-shiksabd.com
-shmetall.com.ua
-shoesonlinebuy.xyz
-shopcheermakeup.info
-sierraapps.com
-site-speed-check.site
+sanjosestartups.com
+sdsjweb.com
+seminarykansas904.ml
+serw.clicksor.com
+sex-dating.co
+sexflirtbook.com
+sex.hotblog.top
+sexsearch.com
+sexxdate.net
+ship-marvel.co.ua
+shohanb.com
+sibvitr.ru
+sideeffectsoftizanidine.blogspot.com
+sigmund-freud.co.uk
+simul.co
+si-unique.com
+smsactivator.ru
+soviet-portal.do.am
+spabali.org
+spasswelt.xyz
+spbchampionat.ru
 spl63.fr
-sport7777.net
-spymac.net
-squidoo.com
-starwars.wikia.com
-stopnarco.ru
-stpicks.com
-stroiminsk.org
-studiokamyk.com.pl
-sugvant.ru
-sundrugstore.com
-taaaak.com
-tabakur77.com
-tattomedia.com
-technopellet.gr
-tizanidine4mguses.blogspot.com
-tizanidineinteractions.blogspot.com
-top250movies.ru
-top-study.work
-tourcroatia.co.uk
-tryrating.com
-tsstcorpcddvdwshbbdriverfb.aircus.com
-twojebook.pl
-viagraneggrx.com
-vip-parfumeria.ru
-vriel.batcave.net
-vsesubwaysurfers.com
-walkme.com
-waysbetter.cn
-webmonetizer.net
-whatistizanidinehclusedfor.blogspot.com
-whereverdesperate.gq
-word-vorlagen.xyz
-xblog.in
-xn----7sbaphztdjeboffeiof6c.xn--p1ai
-xn--80ahvj9e.xn--p1ai
-xn--80aodinpgi.xn--p1ai
-xn--e1afanlbnfckd7c3d.xn--p1ai
-xtubeporno.net
-xxx-cam.webcam
-xxxkaz.org
-yellowproxy.net
-yellowstonesafaritours.com
-yopoint.in
-yourporngay.com
-youtube-downloader.savetubevideo.com
-zapatosenventa.info
-zarabiaj-dzis.pl
-zebramart.ru
-zeroredirect12.com
-zetmaster.ru
-zolotoy-lis.ru
-zvetki.ru
-zx6.ru
+spywarenuker.com
+superoboi.com.ua
+swinginwithme.ru
+szucs.ru
+tecspb.ru
+teguh.info
+telefonsexi.com
+templates.radiodigital.co
+tgtclick.com
+thenews-today.info
+thin.me.pn
+tksn.ru
+toloka.hurtom.com
+topshef.ru
+tourismvictoria.com
+toy-shop.top
+traffic2money.com
+tramadolandtizanidine.blogspot.com
+tupper-posuda.ru
+typer.one
+ukrtvory.in.ua
+vancleefreplica.pw
+vapsy.com
+varikoz24.com
+velobikestock.com
+ventelnos.com
+videochat.tv.br
+vietimgy.pw
+vkontarkte.com
+vladimir.xrus.org
+vodaodessa.com
+vseigru.one
+vsexkontakte.net
+w7s.ru
+wallpapersist.com
+weburok.com
+wesharepics.site
+wholesalejerseysgaa.com
+writingservices17.blogspot.ru
+xitjw.info
+xxxhdvideo.site
+youbrainboost.asia
+yougetsignal.com
+yougotanewdomain.com
+zastroyka.org
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index b2122ba99..f0474a154 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>
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.18.0 (Ubuntu)</center>
 </body>
 </html>
-ml><html>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body>
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -571,14 +581,4 @@ ml><html>
 <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 a69bef7d4..c31c197b9 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.202.245.105	0;
+104.197.122.201	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 06d82088f..87a29c21f 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 5f6ec0ad3..443d9215e 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 9afefade3..9582dd431 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2021.06.2437
+#### Version: V4.2021.06.2438
 #### Bad Referrers Blocked: [7063](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [615](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index c03ac57cc..f31f36836 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2021.06.2437
+#### Version: V4.2021.06.2438
 #### Bad Referrers Blocked: [7063](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [615](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
diff --git a/README.md b/README.md
index 7ed1ffbdf..e638994c1 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 even Fake Googlebots from ever reaching your web sites. [PLEASE SEE: Definition of Bad Bots](#define-bad-bots)
 
 _______________
-#### Version: V4.2021.06.2437
+#### Version: V4.2021.06.2438
 #### Bad Referrers Blocked: [7063](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [615](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
diff --git a/_google_analytics_ghost_spam/README.md b/_google_analytics_ghost_spam/README.md
index 37c37c22c..18dd0baf9 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.2021.06.2437
+#### Version: V4.2021.06.2438
 #### Bad Referrers Blocked: [7063](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad User-Agents (Bots) Blocked: [615](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 #### Fake Googlebots Blocked: [217](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/fake-googlebots.list)
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 ed5f43106..58342486f 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.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
diff --git a/conf.d/globalblacklist-testing-version.conf b/conf.d/globalblacklist-testing-version.conf
index b3b5be12a..1ee07d5dc 100644
--- a/conf.d/globalblacklist-testing-version.conf
+++ b/conf.d/globalblacklist-testing-version.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2021.06.2437
-### Updated: Mon Jun 21 14:55:25 SAST 2021
+### Version: V3.2021.06.2438
+### Updated: Mon Jun 21 15:32:21 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index ed5f43106..58342486f 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2021.06.2437
-### Updated: Mon Jun 21 14:55:24 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:20 SAST 2021
 ### Bad Referrer Count: 7063
 ### Bad Bot Count: 615
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index dbf74bd45..b36a77675 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2021.06.2437
-### Updated: Mon Jun 21 14:55:26 SAST 2021
+### Version: V4.2021.06.2438
+### Updated: Mon Jun 21 15:32:23 SAST 2021
 ### Bad Bot Count: 615
 ###################################################
 ### Version Information ##