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 30a5b9007..e22596857 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.197.122.201 1;
+34.66.25.221 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 c31c197b9..e6677be79 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.197.122.201 0;
+34.66.25.221 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 30a5b9007..e22596857 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.197.122.201 1;
+34.66.25.221 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 c31c197b9..e6677be79 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.197.122.201 0;
+34.66.25.221 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 30a5b9007..e22596857 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.197.122.201 1;
+34.66.25.221 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 c31c197b9..e6677be79 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.197.122.201 0;
+34.66.25.221 0;
127.0.0.1 0;
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 37407911b..1749803d6 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.192.91.101 0;
+35.188.15.155 0;
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 58acf0a1d..87dc4782a 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.202.245.105 1;
+35.192.10.37 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 a69bef7d4..a5f544ae0 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.202.245.105 0;
+35.192.10.37 0;
127.0.0.1 0;
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 58acf0a1d..87dc4782a 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.202.245.105 1;
+35.192.10.37 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 a69bef7d4..a5f544ae0 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.202.245.105 0;
+35.192.10.37 0;
127.0.0.1 0;
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 58acf0a1d..87dc4782a 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.202.245.105 1;
+35.192.10.37 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 a69bef7d4..a5f544ae0 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.202.245.105 0;
+35.192.10.37 0;
127.0.0.1 0;
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 6b7e34e66..7b312db65 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,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.200.49 0;
104.197.122.201 0;
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 3094f666a..cc9d4c8d4 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
-35.202.245.105 0;
35.188.15.155 0;
+35.202.245.105 0;
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 62dc34c93..09b688996 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
+35.192.10.37 0;
35.188.15.155 0;
-34.66.25.221 0;
-104.197.122.201 0;
+34.66.50.208 0;
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 30a5b9007..e22596857 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-104.197.122.201 1;
+34.66.25.221 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 6b7b545b3..6605a05d6 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 @@
-Aspiegel
-crawler.feedback
-FDM
-IDBTE4M
-Jbrofuzz
-POE-Component-Client-HTTP
-SpaceBison
-WebPix
-WebReaper
-ZmEu
+Ankit
+Cosmos
+CSHttp
+Keyword Density
+Magnet
+MarkWatch
+Nameprotect
+ScrepyBot
+Snake
+Xenu
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index ce7879f5a..060ee96b4 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 @@
01h4x.com
360Spider
-404enemy
+404checker
Abonti
-Aboundexbot
+Aboundex
+ADmantX
AfD-Verbotsverfahren
AhrefsBot
+AIBOT
AiHitBot
-AllSubmitter
-Anarchy99
-Ankit
-Anthill
+Alligator
+AlphaBot
Apexoo
-archive.org_bot
-arquivo-web-crawler
-Aspiegel
-autoemailspider
+Asterias
AwarioSmartBot
Backlink-Ceck
-backlink-check
-BacklinkCrawler
BackStreet
BackWeb
+Badass
Bandit
-Barkrowler
+BatchFTP
Battleztar Bazinga
-Bitacle
-BLEXBot
-Blow
+BBBike
+Blackboard
+Black Hole
BlowFish
-Boardreader
Bolt
-BotALot
-Buck
BuiltBotTough
+BuiltWith
+Bullseye
+BunnySlippers
+BuzzSumo
+CATExplorador
CazoodleBot
-CCBot
+Cegbfeieh
+CensysInspect
CheeseBot
-Claritybot
+CherryPicker
Cliqzbot
-Cocolyzebot
+Cloud mapping
CODE87
-cognitiveseo
Collector
-Copier
-CopyRightCheck
-Crescent
+Copyscape
+Cosmos
+CrazyWebCrawler
+CrunchBot
Curious
-Custo
CyotekWebCopy
DatabaseDriverMysqli
+DataCha0s
demandbase-bot
-Digincore
-DIIbot
+Demon
Dirbuster
-DomainAppender
-DomainCrawler
+Discoverybot
+Dispatch
+DittoSpyder
DomainSigmaCrawler
+Domains Project
+domainsproject.org
DomainStatsBot
-DomCopBot
-Dotbot
Download Wonder
DTS Agent
-EasyDL
-eCatch
-ECCP/1.0
-Ecxi
+Ebingbong
+EirGrabber
EMail Siphon
-EMail Wolf
-ExtractorPro
-Extreme Picture Finder
+evc-batch
+Exabot
EyeNetIE
-FemtosearchBot
-FHscan
+Ezooms
+facebookscraper
+Firefox/7.0
+FlashGet
+Flunky
Freeuploader
+FrontPage
Fuzz
-FyberSpider
-GalaxyBot
-Genieo
-GermCrawler
-GetRight
+GetWeb
+Gigablast
Go-Ahead-Got-It
-gopher
-Gotit
-Go!Zilla
-GrabNet
+GoZilla
Grafula
-GrapeFX
-GrapeshotCrawler
-Haansoft
-HaosouSpider
+Harvest
+Havij
HEADMasterSEO
-heritrix
-HTTrack
+Hloader
IDBot
-Id-search
-Image Fetch
+IDBTE4M
+Image Sucker
+Indy Library
InfoNaviRobot
-instabid
-InternetSeer
-ips-agent
+Intelliseek
+InterGET
Iria
-isitwp.com
+IRLbot
Iskanie
-JikeSpider
-JustView
-Kenjin Spider
-Keyword Density
-Kinza
-Kozmosbot
+Joomla
+Jorgee
LeechFTP
-LeechGet
-LexiBot
Lftp
+LibWeb
Libwhisker
+Lightspeedsystems
+Likse
Linkbot
-Linkdexbot
-LinkScan
-LinkWalker
-Lipperhey
-Lipperhey Spider
-Ltx71
-Magnet
-magpie-crawler
-Majestic12
-MarkWatch
-Mass Downloader
+LinkpadBot
+LinqiaMetadataDownloaderBot
+LinqiaRSSBot
+LinqiaScrapeBot
+Lmspider
+MarkMonitor
+Masscan
Mata Hari
MauiBot
+Mb2345Browser
+Meanpathbot
+Mediatoolkitbot
+mediawords
+MFC_Tear_Sample
+Microsoft Data Access
+MIDown tool
MIIxpc
Mister PiX
-MJ12bot
Moblie Safari
-Mojolicious
-Mozlila
+Mojeek
+Morfeus Fucking Scanner
MQQBrowser
+MSFrontPage
muhstik-scan
+Name Intelligence
Nameprotect
+Navroad
+NearSite
Needle
-NetLyzer
-NetSpider
-Net Vampire
+Nessus
+NetZIP
NextGenSearchBot
-Nmap
-NPbot
-Nuclei
+Nikto
+NimbleCrawler
+Nimbostratus
Nutch
-oBot
Offline Explorer
-OnCrawl
+Offline Navigator
Openfind
OpenLinkProfiler
+Openvas
OpenVAS
OPPO A33
OrangeBot
+OutclicksBot
OutfoxBot
-PageAnalyzer
-page scorer
-PageThing.com
-Panscient
-Pavuk
+Page Analyzer
+PageGrabber
+PageScorer
pcBrowser
+PeoplePal
+Petalbot
Picscout
Picsearch
-PictureFinder
-Piepmatz
-Pi-Monster
-plumanalytics
-Pockey
-POE-Component-Client-HTTP
-ProWebWalker
-Rankivabot
-RealDownload
+Pixray
+Probethenet
+ProPowerBot
+Psbot
+Pu_iN
+PyCurl
+Quick-Crawler
+RankActive
+RankFlex
+RankingBot2
+RankurBot
Reaper
RebelMouse
+Recorder
+RedesScrapy
+ReGet
+RepoMonkey
Ripper
-RocketCrawler
-Rogerbot
RSSingBot
s1z.ru
-SalesIntelligent
-SBIder
-scalaj-http
ScanAlert
Scanbot
-Scrapy
-Screaming
+scan.lol
+ScoutJet
+ScreenerBot
ScrepyBot
-Semrush
-SentiBot
+Searchestate
SeobilityBot
-SEOkicks
SEOkicks-Robot
-SEOlyticsCrawler
Seomoz
-seoscanners
SeoSiteCheckup
-Siphon
-SISTRIX
-Sitebeam
+SEOstats
+sexsearcher
SiteCheckerBotCrawler
-SiteExplorer
+SiteLockSpider
SiteSnagger
-Snake
+SmartDownload
Snapbot
-Snoopy
-Sogou web spider
+SocialRankIOBot
+sogouspider
+SpaceBison
+sp_auditbot
spyfu
-Sqlworm
Sqworm
-SuperBot
-SurveyBot
+SuperHTTP
Suzuran
-Swiftbot
-sysscan
-The Intraformant
-Titan
-Trendiction
-trendiction.de
+T8Abot
+tAkeOut
+TheNomad
+Thumbor
+TightTwatBot
+Toata
+Tracemyfile
True_Robot
-Turingos
+Turnitin
+TwengaBot
+Twice
Typhoeus
-UnisterBot
-URLy.Warning
+Upflow
+URLy Warning
Vagabondo
VelenPublicWebCrawler
-voyagerx.com
-WebAuto
-Web Collage
+VeriCiteCrawler
+Voltron
+Wallpapers/3.0
+WBSearchBot
+Webalta
+Web Auto
WebCopier
-WebFetch
-WebLeacher
+Web Enhancer
+Web Fetch
+WebFuck
+WebGo IS
webmeup-crawler
-Web Pix
-WebSauger
+WebReaper
Web Sauger
-Website Quester
-Webster
-WebSucker
+Webshag
+WeSEE
Whack
-Widow
-Wotbox
-WWW-Mechanize
-WWWOFFLE
-x22Mozilla
-Xenu
+Whacker
+Who.is Bot
+WinHTTrack
+Woobot
+WWW-Collector-E
+WWW::Mechanize
+Xaldon WebSpider
+Xaldon_WebSpider
YoudaoBot
+Zermelo
Zeus
-zgrab
-ZmEu
+ZoomBot
+ZumBot
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index 612a312ab..c19934f52 100644
--- a/.dev-tools/test_units/random-bots-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-bots-for-whitelist-test.list
@@ -1,250 +1,250 @@
-360Spider
-Abonti
-Aboundex
-ADmantX
+404enemy
+Acunetix
+AfD-Verbotsverfahren
AiHitBot
Aipbot
-Alexibot
AllSubmitter
-AlphaBot
-Anarchie
Anarchy
-Anarchy99
-Apexoo
arquivo-web-crawler
+Aspiegel
Asterias
autoemailspider
+AwarioRssBot
AwarioSmartBot
BackDoorBot
Backlink-Ceck
-Bandit
-Barkrowler
-Battleztar Bazinga
-BDFetch
-BetaBot
-Bitacle
-Blackboard
+BacklinkCrawler
+BackStreet
Black Hole
-BlackWidow
-Blow
+BLEXBot
+Boardreader
Bolt
BuiltBotTough
-Bullseye
-BuzzSumo
+BuiltWith
Calculon
+CATExplorador
CCBot
-CensysInspect
check1.exe
-Chlooe
Claritybot
-Cliqzbot
-Copier
-Cosmos
-CSHttp
-demandbase-bot
+CODE87
+Collector
+Copyscape
+crawler4j
+Curious
+DigitalPebble
DIIbot
+Dirbuster
+Disco
Discobot
-Discoverybot
Dispatch
DnyzBot
+DomainCrawler
Domains Project
-DomainStatsBot
-DomCopBot
+domainsproject.org
Download Wonder
-Dragonfly
-DTS Agent
-ECCP/1.0
+Drip
+Ebingbong
+eCatch
+EirGrabber
+EMail Siphon
EroCrawler
Exabot
Express WebPictures
ExtractorPro
-EyeNetIE
-facebookscraper
-Fimap
+Extreme Picture Finder
+Ezooms
+FDM
+FHscan
+Firefox/7.0
FlashGet
Flunky
Foobot
-FrontPage
-GalaxyBot
+Freeuploader
+Fuzz
+Fyrebot
+Genieo
GermCrawler
-GetRight
-Gigabot
-Go!Zilla
-GrabNet
-GrapeFX
-GrapeshotCrawler
-GridBot
-Haansoft
+GetWeb
+Gotit
+GoZilla
+GT::WWW
HaosouSpider
Harvest
-HEADMasterSEO
+heritrix
+Heritrix
Hloader
HTMLparser
-HTTP::Lite
+HTTrack
+Humanlinks
+HybridBot
Iblog
-IDBTE4M
Id-search
-Indy Library
+Image Sucker
+IndeedBot
InfoNaviRobot
+instabid
Intelliseek
-Internet Ninja
Iria
isitwp.com
-Iskanie
IstellaBot
-Jetty
+Jbrofuzz
+JennyBot
+JetCar
+JikeSpider
JOC Web Spider
-Joomla
+Jorgee
Kenjin Spider
+Lanshanbot
Larbin
-LexiBot
Libwhisker
-Likse
-LinkextractorPro
+Lightspeedsystems
LinksManager
-LinqiaRSSBot
-LNSpiderguy
+LinkWalker
+LinqiaMetadataDownloaderBot
+Lipperhey Spider
+Litemage_walker
+Ltx71
LWP::Simple
lwp-trivial
-Majestic-SEO
+Magnet
+Mag-Net
+Mail.RU_Bot
+Majestic12
+Majestic SEO
+MarkMonitor
MarkWatch
-MeanPath Bot
+Masscan
+Mata Hari
+MauiBot
+Mb2345Browser
mediawords
MegaIndex.ru
+MFC_Tear_Sample
+MicroMessenger
+Microsoft Data Access
Microsoft URL Control
-MIDown tool
Mister PiX
MJ12bot
-Moblie Safari
-Mojeek
-Morfeus Fucking Scanner
-Mozlila
+MQQBrowser
Mr.4x3
MSIECrawler
-muhstik-scan
Musobot
Name Intelligence
-NearSite
+Nameprotect
Needle
+Nessus
NetAnts
-netEstate NE Crawler
+NetMechanic
+Nettrack
Netvibes
-NetZIP
NextGenSearchBot
+NICErsPRO
Nikto
-NimbleCrawler
Nimbostratus
-Ninja
-Octopus
-Offline Explorer
-Offline Navigator
-Openfind
+oBot
+OpenLinkProfiler
+OpenVAS
OPPO A33
-OutclicksBot
-OutfoxBot
+OrangeSpider
+PageAnalyzer
PageGrabber
-page scorer
-PageThing.com
-Pandalytics
-Papa Foto
-PECL::HTTP
-Petalbot
+Pavuk
PHPCrawl
+Picsearch
+Pimonster
+Pi-Monster
PleaseCrawl
+POE-Component-Client-HTTP
+ProPowerBot
ProWebWalker
-Psbot
-Pu_iN
-PxBroker
-QueryN Metasearch
+Pump
+PyCurl
Quick-Crawler
-RankFlex
-RankingBot
+RankActive
RankingBot2
Rankivabot
-RankurBot
-RealDownload
-RepoMonkey
-RocketCrawler
-RSSingBot
-SalesIntelligent
+Recorder
+ReGet
+Rogerbot
+SBIder
scalaj-http
-scan.lol
ScoutJet
Scrapy
-ScrepyBot
+ScreenerBot
Searchestate
-SearchmetricsBot
Semrush
+SemrushBot
+SeobilityBot
+SEOkicks
+seoscanners
SEOstats
-serpstatbot
-sexsearcher
+Shodan
+SISTRIX
+SiteExplorer
+Siteimprove
SiteLockSpider
-siteripz
-SiteSucker
-Sitevigil
-SmartDownload
+SlySearch
SMTBot
-Snake
-Snapbot
-Sogou web spider
-Sottopop
+Snoopy
+Sociscraper
+sogouspider
SpaceBison
-Spammen
-SpankBot
-Spanner
-sp_auditbot
-SputnikBot
+Spinn3r
+Sqlmap
Sqworm
-Steeler
-Sucker
-Sucuri
-SuperBot
-Surfbot
-SurveyBot
-sysscan
+SuperHTTP
+Suzuran
+Swiftbot
+Szukacz
T0PHackTeam
-T8Abot
tAkeOut
-TeleportPro
-Telesoft
-Telesphoreo
-TheNomad
+The Intraformant
+Thumbor
TightTwatBot
+Toata
+Toweyabot
Turingos
-Turnitin
TwengaBot
Twice
URLy Warning
-Vacuum
Vagabondo
-VCI
-VidibleScraper
+V-BOT
+VelenPublicWebCrawler
+Voltron
voyagerx.com
Wallpapers/3.0
-WBSearchBot
-WebCollage
+WASALive-Bot
+Webalta
+Web Auto
Web Collage
WebCopier
WEBDAV
+WebEnhancer
+Web Fuck
WebGo IS
-WebLeacher
-Webster
-WebSucker
-Web Sucker
+WebmasterWorldForumBot
+webmeup-crawler
+WebSauger
+WebsiteExtractor
+Website Quester
+WebStripper
WebZIP
-WeSEE
-Widow
+Whack
+Whacker
WiseGuys Robot
+Wonderbot
Woobot
-Wotbox
+Wprecon
+WPScan
WWW-Collector-E
WWW-Mechanize
-x22Mozilla
-Xaldon_WebSpider
-YoudaoBot
+WWWOFFLE
+Xenu
+Zade
Zauba
+zauba.io
Zeus
zgrab
Zitebot
ZmEu
-ZoominfoBot
+ZoomBot
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 5789b5ce9..ecc401fd2 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 @@
-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
+articlesdirectoryme.info
+clicksotrk.com
+daymusam.com
+gowreckdiving.com
+moneyviking-a.akamaihd.net
+restaurantlescampi.com
+tizanidinehydrochloride4mgstreetvalue.blogspot.com
+tootoo.to
+vozbujdenie.com
+wdrake.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 92aa14092..1981b169d 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 @@
-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
+0912701309f8ce.com
+1001desert.com
+12u.info
+1kdailyprofit.me
+1webmaster.ml
+21h2o.com
+256bit.by
+2ads.co.uk
+2nt.ru
+4ureyesonly.com
+51.la
+57883.net
+5elementov.ru
+91abcw.com
+98oi.ru
+aasoldes.fr
+abbanreddy.com
+absugars.com
adconscious.com
-adidas.frwebs.fr
-adsfresh.men
-advocatemsk.ru
-adzerg.com
-aero2.ru
-agapovdg.ru
+adman.gr
+adpremium.org
+ads-cool.pro
+ads.tremorhub.com
+adtech.us
+advancedmassagebysara.com
+advertisingtag.net
+a.frcls.fr
ageofclones.com
-allmarketsnewdayli.gdn
-allwomen.info
-amazon-adsystem.com
+akvamaster.dp.ua
+alive-ua.com
+alloysteel.ru
+allpdfmags.net
+aloofly.com
+alphacarolinas.com
+alvtank.se
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-b0x.pl
-beetpics.pw
-belinvestdom.by
-bestchoice.cf
+amospalla.es
+animali.deagostinipassion.it
+animalrank.com
+apartamentwroclaw.eu
+apiadanaknet-a.akamaihd.net
+apibrowsesmartne-a.akamaihd.net
+apimossnetinfo-a.akamaihd.net
+apioasisspacenet-a.akamaihd.net
+apple.com-cleaner.systems
+architecturebest.com
+arcteryxstore.online
+artdeko.info
+asiavirtualsolutions.com
+asrv-a.akamaihd.net
+asseenontvonline.ru
+avramstroy.ru
+azarttoto.com
+b00kmarks.com
+baikaleminer.com
+bang-hotties.com
+baoxaydung.com.vn
+barbourjackets.online
+battlecarnival.su
+battleforupdating.site
+bbtec.net
+beachpics.com
+beauty-clinic.ru
+beclean-nn.ru
+bestbuy.ca
+bestdraws.com
+besthomemadepornsites.com
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
-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
+best-seo-solution.com
+betonka.pro
+bezcmexa.ru
+bharatdefencekavach.com
+bif-ru.info
+biznesschat.net
+blackle.com
+blackplanet.com
+bongiornos.info
+boo-arts.com
+boobsimge.com
+bookmaker-bet.com
+brainboosting.club
+brandov.ru
+breastaugmentation.co.za
+browserprotecter.com
+budpost.com.ua
+bupropion-sr-150-mg.us
+buy-cheap-online.info
+buyessayonline19.blogspot.ru
+buyk.host.sk
+buy-meds24.com
+buypillsorderonline.com
+cam-kontakte.org
+capture-room.com
+cardsdumps.com
+cbcseward.com
+centrumcoachingu.com
+cfacarrosserie74.com
+cfcl.co.uk
+c-gainsbourg.com
+chatroulette.world
+cheapbelstaff.online
+cheap-pills-norx.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
-copenergo.ru
-counterbot.com
-covadhosting.biz
-cs-passion.pl
-customcatchcan.com
+cialischsrx.com
+cjs.com.ru
+clicksor.net
+compliance-fred.top
+compliance-jack.top
+compliance-julianna.top
+compliance-mary.top
+cookingmeat.ru
+corta.co
+cosmetic.donna7753191.ru
+cowlmash.com
+culturevie.info
+customergrowthsystems.com
+cvety24.by
+cv.wallhade.co
cyclobenzaprinevstizanidine.blogspot.com
-dailystrength.org
-darmebel.com.ua
-dear-diary.ru
-defenderxtactical.com
-dellalimov.com
-deluxedumps.com
-descargar-musica-gratis.net
-dev78.dioniqlabb.se
-dieswaene.com
-dimfour.com
-directrev.com
-dollartree.info
-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
+cyprusbuyproperties.com
+danashop.ru
+darodar.com
+d-black.bz
+delayreferat.ru
+demenageur.com
+deniven.1bb.ru
+den-noch24.ru
+dfwu1019.info
+diesel-parts28.ru
+dikqlyremy.info
+dnsrsearch.com
+doctormakarova.ru
+domainanalyzing.xyz
+dostavka-v-krym.com
+downloads-whatsapp.com
+dtm-spain.com
+dumuelave.xyz
dvervmoskvu.ru
-dynainbox.com
-earn-from-articles.com
-ecxtracking.com
-eduinfosite.com
-ekosmetyki.net.pl
-eldiariodeguadalajara.com
-elektir.ru
-elektrozigarettekaufen1.devhub.com
-ertelecom.ru
-escort-russian.com
+dyshagi.ru
+easycommerce.cf
+ebooknovel.club
+ecookna.com.ua
+ee77ee.com
+electrik-avenue.com
+elektrozigarette2.wordpressy.pl
+elektrozigaretten1.tumblr.com
+eloconcream.blogspot.com
+enskedesquashclub.se
+esnm.ru
+essayservicewriting.org
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
-globalsurfari.com
-goforexvps.com
-goldandcard.ru
-golden-catalog.pro
-goldpanningtools.com
-golfresa.lucania.se
-gonextmedia.com
-goodwinmetals.co
-greendream.com.ua
-growmyfunds.ca
-grupografico-pilar.com.ar
-gsasearchenginerankerhelp.com
-handsandlegs.ru
-hatdc.org
-hdpixion.com
+everflora.ru
+expresstoplivo.ru
+extlabs.io
+ezigarettekaufen1.hpage.com
+ezigarettekaufen2.yolasite.com
+ezofest.sk
+feargames.ru
+figuringmoneyout.com
+filkhbr.com
+financeloan.us
+finejewelryshop.ru
+firesub.pl
+fishingwholesale.us
+fiuxy.com
+flauntyoursite.com
+flavors.me
+flex4launch.ru
+forum69.info
+frankofficial.ru
+freefoto.ca
+freenom.link
+free-share-buttons.com
+freeuploader.com
+funnel.co.za
+fxtips.ru
+fxund.us
+games.kolossale.ru
+gaygalls.net
+ge0ip.org
+geileweiber.tk
+getridofstretchmarks.org
+given2.com
+globalscam.ga
+goldenggames.com
+gomusix.com
+gorodservis.ru
+gratuitxblcodes.com
+growboxbl.ru
+guildebzh.info
+haikuware.com
+hd-film.pl
+hd-filmy.net
health-medical-portal.info
-heliko.no
-heroz.fr
-hikesearch.net
-hjaoopoa.top
-hmywwogw.bloger.index.hr
-hoholikik.club
-hol.es
-host-tracker.com
+hem.passagen.se
+hexpilot.com
+hit-kino.ru
+home.myplaycity.com
+horoshieokna.com
+hotblognetwork.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
-ivanstroi.ru
-izhevsk.xrus.org
-izismile.com
+howtowhitenteethfast.xyz
+hptwaakw.blog.fc2.com
+hreade.com
+hybrid.ru
+ibb.com.ua
+ibmdatamanagement.co
+ideawheel.com
+ilikevitaly.com
+ilovevitaly.com
+ilovevitaly.xyz
+imabase.com
+imediadesk.com
+imguramx.pw
+imperia31.ru
+inclk.com
+increasewwwtraffic.info
+infogame.name
+infostatsvc.com
+interfucks.net
+int.search.tb.ask.com
+investpamm.ru
+ixora.pro
+izhevsk.zrus.org
izoll.ru
-javxxx18.com
-joingames.org
-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
+jerseywholesalechinabiz.com
+jikoman.info
+kakadu-interior.com.ua
+karachev-city.ru
+kashubadesign.ru
+kazinogames.lv
+ketrzyn.pl
+keywords-monitoring-success.com
+kidd.reunionwatch.com
+kimcurlrvsms.com
+kinobest.pl
kiskinhouse.com
-klejonka.info
-klumba55.ru
-komputernaya-pomosh-moscow.ru
+kit-opt.ru
+kndxbkdx.bloger.index.hr
konpax.com
-kosova.de
-kuzinsp.ru
-lapolis.it
-lazy-z.com
-leboard.ru
-leftofcentrist.com
-lenvred.org
-lescinq.com
-life-instyle.com
-lineshops.biz
-linkrr.com
-lion.misba.us
-llastbuy.ru
-lostfilm-online.ru
-louboutinshoes.xyz
-lowephotos.info
-lrac.info
+kostenloser-sex.com
+kraljeva-sutjeska.com
+kredit-blog.ru
+ktotut.net
+kurwa.win
+lacasamorett.com
+ladsup.com
+la-fa.ru
+lanasshop.ru
+lancheck.net
+laxob.com
+lazymanyoga.com
+lernur.net
+lion.playtap.us
+lion.snapmap.us
+liran-locks.com
+livetsomudvekslingstudent.bloggersdelight.dk
+loftdigital.eu
+lostaruban.com
+louboutinreplica.pw
lsex.xyz
-lsp-awak-perikanan.com
-lubetube.com
-lyrster.com
-macdamaged.space
+ltvperf.com
+m1media.net
+magicalfind-a.akamaihd.net
maglid.ru
-maju.bluesalt.co
-managerpak204.weebly.com
manuscript.su
-matrixalchemy.com
-mature.free-websites.com
+maridan.com.ua
+marketland.ml
+masturbate.co.uk
+matchpal-a.akamaihd.net
+max-p.men
+mb140.ru
+mcar.in.ua
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
-musezone.su
-muzaporn.com
-mxgetcode.com
-mycaf.it
-mycouponizemac.com
-myprintscreen.com
-myyour.eu
+medicinacom.ru
+medkritika.ru
+meduza-consult.ru
+memberty.com
+metaxalonevstizanidine.blogspot.com
+meteostate.com
+mhtr.be
+mikozstop.com
+millionare.com
+miniads.ca
+missclub.info
+mixx.com
+mmofreegames.online
+mobifunapp.weebly.com
+mobilierland.com
+mobplayer.ru
+modabutik.ru
+movpod.in
+mrbitsandbytes.com
+muabancantho.info
+music7s.me
+my-big-family.com
+myhydros.org
+myliveblog.ru
+mymercy.info
+mywallpaper.top
nalogovyy-kodeks.ru
-narco24.me
-nationalbreakdown.com
-negral.pluto.ro
-net-profits.xyz
-networkad.net
-nevansk.ru
-new-apps.ru
+nalogovyykodeks.ru
+namecrumilchlet.tk
+narkologiya-peterburg.ru
+narosty.com
+national-today-winning-winner.club
+naturalshair.site
+netoil.no
nhl09.ru
-nibbler.silktide.com
-niki-mlt.ru
-novodigs.com
-nullrefer.com
-nvformula.ru
-oconto.ru
-offers.bycontext.com
-officedocuments.net
-okuos.com
-olvanto.ru
+notebook-pro.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
-palvira.com.ua
-pammik.ru
-partner-trustworthy.men
-pc-services.ru
-pc-virus-d0l92j2.pw
-picmoonco.pw
-picphotos.net
-picturesify.com
+onlineserialy.ru
+online-x.ru
+optom-deshevo.ru
+paceform.com
+pacificair.com
+panicatack.com
+parajumpersjakkesalgnorge.info
+park.above.com
+partner-stop.men
+partybunny.ru
+patol01.pw
+pattersonsweb.com
+perederni.net
+petsblogroll.com
+peugeot-club.org
+physfunc.ru
+piccshare.com
+picturesmania.com
+pills24h.com
piluli.info
-piuminiita.com
-pix24x7.com
-pl.id-forex.com
-plugingeorgia.com
-pony-business.com
-pornhub-ru.com
-porno-chaman.info
-pornoplen.com
-porno-raskazy.ru
-pornoted.com
-porno-transsexuals.ru
-pornotubexxx.name
+pinapchik.com
+pinkduck.ga
+pixshark.com
+platezhka.net
+polytopesexempt.com
+popup.matchmaker.com
+pornotubs.com
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
+professionalwritingservices15.blogspot.ru
+prohoster.info
+prostitutki-yaroslavlya.org
+pro-tec.kz
+pulseonclick.com
+puzzleweb.ru
+quelle.ru
+raisedseo.com
+razleton.com
+realresultslist.com
+reckonstat.info
+reelheroes.net
+relayblog.com
+restorator-msk.ru
+resultshub-a.akamaihd.net
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
-saugatuck.com
-scanmyphones.com
-scoopquest.com
-scopich.com
-scrapy.org
-sdelai-prosto.ru
-seadragonherbery.com
-searchkut.com
-searchtooknow-a.akamaihd.net
+rezeptiblud.ru
+rfd-split.hr
+riralmolamsaca.tk
+rogervivierforsale.com
+roma-kukareku.livejournal.com
+rootandroid.org
+royal-investments.net
+runtnc.net
+russia-tao.ru
+sabaapress.com
+sack.net
+safe-app.net
+saitevpatorii.com
+salmonfishingsacramentoriver.com
+satoristudio.net
+scanmarine.info
+scanner-mary.top
+searchmywindow-a.akamaihd.net
+securesmrt-dt.com
+security60-e.com
+sel-hoz.com
seminarygeorgia59.ga
-sendearnings.com
+seocheki.net
+seomarketings.online
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
-siteexpress.co.il
-sitevalued.com
-sitopreferito.it
-sky-mine.ru
-skyway24.ru
+seozoom.it
+serpstat.com
+sex.hotblog.top
+sexkontakte-seite.com
+sexpornotales.net
+sexyali.com
+sheerseo.com
+shitmovs.com
+shopcheermakeup.info
+shoppingmiracles.co.uk
+shopsellcardsdumps.com
+sierraapps.com
+sinestesia.host.sk
+siteripz.net
+sk.golden-praga.ru
slavia.info
-slomm.ru
+slonechka.ru
+small-game.com
+smartadserver.com
+smartpet.ru
+smartshoppymac.com
soaksoak.ru
-socialmediasuggest.com
-softtor.com
-soheavyblog.com
-sohoindia.net
-sotkal.lark.ru
-spabali.org
-speeddream.xyz
-spinnerco.ca
-spitfiremusic.com
-spymac.net
-stromerrealty.com
+socialmadesimple.com
+social-s-ggg.xyz
+softomix.com
+solinf.co
+songoo.wz.cz
+spasswelt.xyz
+specialfinanceoffers.com
+sports-supplements.us
+stairliftsarea.com
+stathat.com
+steelmaster.lv
+storehouse.ua
+strag-invest.ru
+strfls.com
+stroiminsk.com
survival.betteroffers.review
-susanholtphotography.com
-suture.co
-swimpool.ca
-swsociety.se
-tacbibirfa.tk
-tagil.zrus.org
-taqywu51.soup.io
-tecspb.ru
-telsis.com
-terrafootwear.us
-thecoolimages.net
-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
-tuckpointingmasonrysystems.com
-turbo-suslik.org
-turizm.bz
-ucsol.ru
-uhod-za-sobakoj.ru
-ukrtvir.com.ua
-umekana.ru
-univerfiles.com
-uptime-alpha.net
-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
+svetodiodoff.ru
+syvertsen-da.no
+taihouse.ru
+tattooha.com
+templates.franklinfire.co
+terraclicks.com
+tetracsaudi.com
+textads.men
+tfxiq.com
+thaisamkok.com
+thebitcoincode.com
+thecoral.com.br
+tizanidine4mg.blogspot.com
+tizanidinecapsules.blogspot.com
+tizanidinehcl2mgtablet.blogspot.com
+tizanidineingredients.blogspot.com
+tizanidineshowupondrugtest.blogspot.com
+tksn.ru
+top10-online-games.com
+topsy.com
+torrents-tracker.com
+tuberkuleznik.ru
+tubo360.com
+twojebook.pl
+ua.tc
+uggbootsoutletsale.us
+uginekologa.com
+ural-buldozer.ru
+uroki.net
+userequip.com
+ussearche.cf
+vekzdorov.ru
+veopornogratis.xxx
+viagra-soft.ru
+viagroid.ru
+vids18.site
+vip-dom.in
+visitcambridge.org
+vodaodessa.com
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
+vsdshnik.com
+vseigry.fun
+warezkeeper.com
+watsonrealtycorp.com
+websiteaccountant.de
+wechatdownload10.com
+wedding-salon.net
whatsappdownload10.com
-wholesalejerseyscheapjerseys.us.com
-wieseversa.no
-winwotgold.pl
-wleuaprpxuvr.ga
-wordpress-crew.net
-worldoffiles.ru
+wholesalejerseychinaoutlet.com
+wholinkstome.com
+withstandingheartwarming.com
+woodyguthrie.se
+worldinternetauthority.com
+wovis.site
+wsgames.ru
+wttavern.com
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
+xchangetrak.com
+x-diesel.org
+xev.ru
+xfire.com
+xjlottery.com
+xn--80ab4aa2g.xn--p1ai
+xn----9sbebi2bvzr7h.xn--p1ai
+xn--l1aengat.xn--p1ai
+xtrafficplus.com
+xvideospornoru.com
xxxtube69.com
-xz618.com
xzlive.com
-yes-com.com
+y8games-free.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
+ypmuseum.ru
+yugo-star.ru
+zagadki.in.ua
+zeroredirect8.com
+zeroredirect9.com
+znakomstva-moskva77.ru
+zoodrawings.com
+zoominfo.com
+zoomovies.org
+zoompegs.com
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 7e1d907f1..1e1dc56e3 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 @@
-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
-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
-cheapcigarettesc.info
-chelnytruck.ru
-clksite.com
-cmhomestayagency.com
-comeondog.info
-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
+2020iscoming.info
+40cg.com
+8si.ru
+9icmzvn6.website
+9med.net
+aa9d046aab36af4ff182f097f840430d51.com
+abcdeg.xyz
+accessoires-mode.in
+adtiger.tk
+agecheckadult.com
+all-number.com
+altamayoztourism.com
+angry-fermi-7633.arukascloud.io
+arabseyes.com
+asscenihotosidea.blogspot.co.za
+atelielembrancaqueencanta.com.br
+audiobangout.com
+autoloans.com
+autowebmarket.com.ua
+avtoarenda.by
+bbtec.net
+best-mam.ru
+bestwrinklecreamnow.com
+blogs.rediff.com
+bolegapakistan.com
+bombla.org
+breget74.ru
+brokergid.ru
+buron.pw
+buscarfoto.com
+candcstuccoandstone.com
+candiceloves.us
+cashkitten-a.akamaihd.net
+castingbank.ru
+cdn.walkme.com
+cgi2.nintendo.co.jp
+chastnoeporno.com
+cheapwebsitehoster.com
+clothesforcash.com
+com-onlinesupport.site
+companies-catalog.com
+compliance-nelson.top
+conocer-sanabria.com
+contentsexpress.com
+coolwallpapers-hd.com
+crackguru.tk
+creams.makeforum.eu
+creditwell.ru
+cryptoswap.biz
+customsua.com.ua
+dailyfinancefix.com
+db.speedup.gdn
+degerlund.net
+delfin-aqua.com.ua
+dogbreedspicture.net
+dojki-hd.com
+domainsphoto.com
+donvito.unas.cz
+doreenblog.online
+ed-shop01.ru
+ege-russian.ru
+ekspresihati.info
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
+elektrozigarettekaufen1.devhub.com
+elexies.info
+empis.magix.net
+enternet.ee
+european-torches.ru
+exportshop.us
+f07.de
+fashion-stickers.ru
+feorina.ru
+fighrofacciufreesig.ga
+flagcounter.me
+flashbannernow.com
+foodcrafts.website
+food.dtu.dk
+forpackningsutveckling.se
+freefoto.ca
+freshsuperbloop.com
+fsakhalin.ru
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
-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
-lashstudia.ru
+genericviagrasildenafiled.net
+gentamicineyedrops.blogspot.com
+glavprofit.ru
+gnuetella.com
+golmau.host.sk
+gonextmedia.com
+goodwriterssales.com
+gopixdatabase.com
+goroda-vsego-mira.ru
+gotomontenegro.net
+greatidea.marketing
+grizzlysgrill.com
+handicapbathtubarea.com
+handsandlegs.ru
+hd720kino.ru
+hem.passagen.se
+hiwibyh.bugs3.com
+hollywoodactress.info
+house.sieraddns.com
+howopen.ru
+ideoworld.org
+imediadesk.com
+imgata.com
+incep.imagine-ex.co
+indianmedicaltourismshop.com
+inome.com.ua
+investpamm.ru
+iqupdatetmz.win
+isitwp.com
+iusstf.org
+jabimgo.pw
+japfm.com
+jasonpartington.com
+kareliatobacco.ru
+karusel-market.ru
+kerei.ru
+keywesthideaways.co
+keywordhut.com
+kiwi237au.tk
+konteiner24.com
+kovesszucs.atw.hu
+krasnodar.ru
+kretpicf.pw
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
+levaquin750mg.blogspot.com
+lexixxx.com
+linkrr.com
+lirunet.ru
+livingcanarias.com
+magicplayer-s.acestream.net
+marcoislandvacations.net
+marwer.info
+masturbate.co.uk
+matb3aa.com
+mbiologi.ru
+medicines-choice.com
+menetie.ru
+mmoguider.ru
+moesen-ficken.com
+mycaf.it
+myfreetutorials.com
myyour.eu
-narkologiya-orel.ru
-nastydollars.com
-nationalbreakdown.com
-nfljerseysforsalewholesaler.com
-nhl09.ru
-nicovideo.jp
-nsatc.net
-nuup.info
-obiavo.com
-okmedia.sk
-onlyporno.ru
+naturalpharm.com.ua
+needtosellmyhousefast.com
+nmrk.ru
+noclegonline.info
+norththeface.store
+novosibirsk.xrus.org
+nuit-artisanale.com
+obiavo.net
+onefilms.net
+orenburg-gsm.ru
+oxotl.com
+ozoz.it
+paidonlinesites.com
partner-host.men
-pearlisland.ru
-pihl.se
-platesauto.com
-platezhka.net
-play.leadzupc.com
-podshipniki-nsk.ru
-poptool.net
-porno-play.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
-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
-spywarenuker.com
-superoboi.com.ua
-swinginwithme.ru
-szucs.ru
-tecspb.ru
+pflexads.com
+pictures-and-images.com
+pila.pl
+pinwallpaper.xyz
+pixelrz.com
+pogosh.com
+poiskzakona.ru
+popmarker.com
+pornmania.pl
+pozdrawleniya.ru
+preg.marketingvici.com
+prize44.com
+proftests.net
+pyrodesigns.com.au
+rabotaetvse.ru
+rednise.com
+registrationdomainsite.com
+renecaovillasale.online
+rent2spb.ru
+rethinkwasteni.info
+rockma.se
+sad-torg.com.ua
+scanner-jess.top
+searchwebknow-a.akamaihd.net
+seeingmeerkat.com
+seo18.su
+serdcenebolit.com
+sexobzor.info
+sextracker.be
+sexy-screen-savers.com
+shemalegalls.blogporn.in
+shisha-swag.de
+shivafurnishings.com
+shoplvlv.us
+simplepooltips.com
+site-speed-check.site
+skanninge.se
+skatestick.bid
+sovetogorod.ru
+sport-video-obzor.ru
+stanthonyscatholicchurch.org
+stopnarco.ru
+stroiminsk.org
+superlist.biz
+suture.co
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
+terraclicks.com
+themeforest.net
+tiandeural.ru
+timecrimea.ru
+tivolibasket.it
+tizanidineandcipro.blogspot.com
+tizanidinehcl4mgtabinfo.blogspot.com
+tizanidinehydrochloride4mgstreetvalue.blogspot.com
+tizanidinerecreationaluse.blogspot.com
+tovaroboom.vast.ru
+tozup.com
+tracfone.com
+trudogolik.net
+ttrraacckkrr.com
+tula.mdverey.ru
+uchetunet.su
+ufa.xrus.org
+ukrtvir.com.ua
+umg-stroy.ru
+valuado.com
+vegascosmetics.ru
+venta-prom.ru
+videochat.life
+video--production.com
+voluumtracker1.com
+vpnhowto.info
+vse-pesni.com
+vvpg.ru
+waterefficiency.co
+waysbetter.cn
+web-analytics.date
+web.cvut.cz
+while.cheapwebsitehoster.com
+word-vorlagen.net
+xaylapdiendanang.com
+xkaz.org
+xn--80aaagvmjabrs1aoc9luc.xn--p1ai
+xn----ctbbcjd3dbsehgi.xn--p1ai
+xsion.net
+xtube.com
+yellowproxy.net
+yellowstonevisitortours.com
+yougame.biz
+youraticles.pl
+zocaparj.kz
+zscalerone.net
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index b2122ba99..3612ceb8a 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -5,13 +5,6 @@
nginx/1.18.0 (Ubuntu)