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 458f571a4..8a7a5941a 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.237.56.208	1;
+104.196.57.92	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 7f6a65382..9a0a5abca 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.237.56.208	0;
+104.196.57.92	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 458f571a4..8a7a5941a 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.237.56.208	1;
+104.196.57.92	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 7f6a65382..9a0a5abca 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.237.56.208	0;
+104.196.57.92	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 458f571a4..8a7a5941a 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.237.56.208	1;
+104.196.57.92	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 7f6a65382..9a0a5abca 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.237.56.208	0;
+104.196.57.92	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 b9e2062b5..3d83c4983 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.237.56.208           0;
+34.74.79.111            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 866a53036..8a7a5941a 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.196.72.151	1;
+104.196.57.92	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 118499141..9a0a5abca 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.196.72.151	0;
+104.196.57.92	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 866a53036..8a7a5941a 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.196.72.151	1;
+104.196.57.92	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 118499141..9a0a5abca 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.196.72.151	0;
+104.196.57.92	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 866a53036..8a7a5941a 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.196.72.151	1;
+104.196.57.92	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 118499141..9a0a5abca 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.196.72.151	0;
+104.196.57.92	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 516a1bb43..cfa633c37 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.196.72.151           0;
+34.74.79.111            0;
 104.196.57.92           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 01954ae33..dc681a445 100644
--- a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
@@ -46,4 +46,4 @@
 # - 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.196.72.151           0;
-35.196.158.85           0;
+34.74.79.111            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 cfa633c37..ce4d992b8 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-34.74.79.111            0;
 104.196.57.92           0;
+35.196.158.85           0;
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 458f571a4..8a7a5941a 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.237.56.208	1;
+104.196.57.92	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 9d5fbb40e..4db33e212 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 @@
-Anarchy99
-Bolt
-crawler4j
-ExtLinksBot
-JennyBot
-LinqiaMetadataDownloaderBot
-MicroMessenger
-Microsoft Data Access
-Siphon
-The Intraformant
+Cloud mapping
+Flunky
+Internet Ninja
+Lightspeedsystems
+Netcraft
+RankingBot
+satoristudio.net
+TeleportPro
+Trendictionbot
+ZyBorg
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index cea5272ac..5307bb557 100644
--- a/.dev-tools/test_units/random-bots-for-test.list
+++ b/.dev-tools/test_units/random-bots-for-test.list
@@ -1,250 +1,250 @@
-360Spider
+404checker
 404enemy
+80legs
+Abonti
+Aboundexbot
 Acunetix
 ADmantX
-AhrefsBot
+AfD-Verbotsverfahren
+Aipbot
+AllSubmitter
+AlphaBot
 Anarchy99
-Ankit
 ASPSeek
-AwarioRssBot
+Attach
 AwarioSmartBot
+BacklinkCrawler
+BackStreet
 BackWeb
-Barkrowler
-BBBike
-BDFetch
+Badass
+Battleztar Bazinga
+BetaBot
 Bigfoot
+Blackboard
 BlackWidow
+BLEXBot
 Blow
 BlowFish
-Boardreader
-Bolt
 BotALot
-Buck
+Brandprotect
+Buddy
+BuiltBotTough
 BuiltWith
-BunnySlippers
-BuzzSumo
-CazoodleBot
-Claritybot
-Cloud mapping
+Bullseye
+CATExplorador
+CCBot
+CensysInspect
+check1.exe
+CherryPicker
+ChinaClaw
+Cocolyzebot
 Cogentbot
+Copier
 Craftbot
-CrazyWebCrawler
-Crescent
+crawler4j
+CSHttp
+Curious
+CyotekWebCopy
 DataCha0s
-Demon
+demandbase-bot
 Deusu
-Dirbuster
-Disco
+DigitalPebble
 Discobot
-DnyzBot
-DomainAppender
-DomainCrawler
-DomainSigmaCrawler
+Discoverybot
+DittoSpyder
 Domains Project
+domainsproject.org
 DomainStatsBot
-Dotbot
 Download Wonder
-Dragonfly
 Drip
-DTS Agent
-Ebingbong
+EasyDL
 eCatch
-EMail Siphon
+Ecxi
+EirGrabber
 EMail Wolf
+EroCrawler
 Evil
-ExtLinksBot
-ExtractorPro
-Extreme Picture Finder
-Ezooms
+facebookscraper
 FDM
-Fuzz
-FyberSpider
-GalaxyBot
+Fimap
+FlashGet
+Flunky
+Foobot
+Freeuploader
 GermCrawler
-Getintent
-GetRight
-Go-Ahead-Got-It
-GoZilla
+Gigablast
+Gigabot
+gopher
+Gotit
 Go!Zilla
-GrabNet
-GrapeFX
 GrapeshotCrawler
+Haansoft
+HaosouSpider
 Harvest
-HEADMasterSEO
 heritrix
-IDBot
-IDBTE4M
+HMView
+HTTrack
+HybridBot
+Iblog
 Id-search
-Image Fetch
-InfoNaviRobot
+Image Sucker
 InterGET
-Internet Ninja
-ips-agent
-Iria
 Iskanie
 IstellaBot
 JamesBOT
 Jbrofuzz
-JetCar
-Jetty
-JikeSpider
 JOC Web Spider
 Joomla
+JustView
 Jyxobot
-Kozmosbot
-Larbin
+Kenjin Spider
+Lanshanbot
 LeechFTP
-LibWeb
+LeechGet
+Lftp
 Libwhisker
-Lightspeedsystems
-Linkbot
 LinkextractorPro
 LinkpadBot
+LinkWalker
 LinqiaMetadataDownloaderBot
+LinqiaScrapeBot
 Lipperhey
-Lipperhey Spider
 Litemage_walker
-LNSpiderguy
-lwp-request
-LWP::Simple
-lwp-trivial
-Mag-Net
-Majestic12
-Majestic SEO
-Majestic-SEO
-MarkMonitor
+Magnet
+Mail.RU_Bot
 MarkWatch
-Mass Downloader
 Mb2345Browser
-meanpathbot
+MeanPath Bot
+mediawords
 MegaIndex.ru
-MFC_Tear_Sample
 MicroMessenger
-Microsoft Data Access
-Moblie Safari
+MIIxpc
+MJ12bot
 Mojeek
-MQQBrowser
-MSIECrawler
-Msrabot
+Morfeus Fucking Scanner
+Mozlila
+MSFrontPage
+MTRobot
+muhstik-scan
 Musobot
-Name Intelligence
-Navroad
-Needle
+Nameprotect
 NetAnts
-NetLyzer
+Netcraft
+netEstate NE Crawler
+NetMechanic
 Nettrack
 NetZIP
-NICErsPRO
+NextGenSearchBot
+Nibbler
 Nikto
-NimbleCrawler
-NPbot
+Nimbostratus
+Nmap
+Nutch
 oBot
-Octopus
 Offline Explorer
-Offline Navigator
-Openvas
-OutclicksBot
-OutfoxBot
-PageAnalyzer
+OPPO A33
+OrangeSpider
 Page Analyzer
 PageScorer
-PageThing.com
-Panscient
+Pandalytics
 Papa Foto
 Pavuk
 PECL::HTTP
+PHPCrawl
+Picsearch
 PictureFinder
-Piepmatz
-Pimonster
-Pockey
+PleaseCrawl
+POE-Component-Client-HTTP
 Probethenet
 ProPowerBot
+ProWebWalker
 Psbot
-Pu_iN
-PxBroker
+Pump
 Quick-Crawler
-RankActiveLinkBot
-RankingBot
-RankurBot
-Reaper
+RankActive
+RankingBot2
+RealDownload
 Recorder
-Re-re
-ripz
-RocketCrawler
-s1z.ru
-SalesIntelligent
-satoristudio.net
-scalaj-http
+RepoMonkey
+Rogerbot
+SBIder
 scan.lol
-ScreenerBot
-Semrush
+ScoutJet
+Screaming
+ScrepyBot
+SearchmetricsBot
 SemrushBot
 SentiBot
 SeobilityBot
 SEOkicks
-Seomoz
-seoscanners
-SeoSiteCheckup
-seostar
+SEOkicks-Robot
+SEOprofiler
+SEOstats
 sexsearcher
-SISTRIX
-sitechecker.pro
-SiteExplorer
 Siteimprove
 siteripz
-Sitevigil
-SlySearch
+SiteSnagger
+SMTBot
+Snapbot
 SocialRankIOBot
-Sociscraper
 sogouspider
+Sogou web spider
+Sottopop
+Spammen
 SpankBot
-Spanner
-Spinn3r
-Sqlworm
-Steeler
-Sucuri
-T8Abot
-Teleport
+SputnikBot
+spyfu
+Sqlmap
+SuperBot
+Swiftbot
+Szukacz
+tAkeOut
+TeleportPro
+Telesoft
+The Intraformant
 TheNomad
-Thumbor
+TightTwatBot
 Toata
 Tracemyfile
+Trendiction
 Trendictionbot
-trendiction.com
-Turingos
+trendiction.de
 TurnitinBot
 Twice
 URLy Warning
 URLy.Warning
 Vacuum
-V-BOT
+Vagabondo
+VCI
 VidibleScraper
-Virusdie
-Voltron
+Voil
 voyagerx.com
+Wallpapers/3.0
 WBSearchBot
+WebAuto
+WebBandit
+WebCollage
 WebCopier
-WebEnhancer
+Web Enhancer
+Web Fetch
+WebFuck
 Web Fuck
-WebmasterWorldForumBot
-WebSauger
+WebGo IS
+WebImageCollector
+WebLeacher
+webmeup-crawler
+WebReaper
 Web Sauger
-WebsiteExtractor
-Website Quester
+WebSucker
 Web Sucker
-WebWhacker
 WebZIP
-WeSEE
 Whack
-Widow
-Wonderbot
-WWW-Collector-E
-Xaldon WebSpider
-Xaldon_WebSpider
-Xenu
+Who.is Bot
+Wotbox
+WPScan
+WWWOFFLE
 xpymep1.exe
-Zade
-Zauba
-Zermelo
+Zeus
+Zitebot
 ZoomBot
-ZumBot
+ZyBorg
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index 19e0ac417..54e9c47b7 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
-Abonti
-Aboundex
+404checker
 ADmantX
 AfD-Verbotsverfahren
 AiHitBot
+Aipbot
 Alligator
-Anarchy99
-Ankit
-arquivo-web-crawler
-Aspiegel
-ASPSeek
+archive.org_bot
+Attach
+AwarioRssBot
 BackDoorBot
-backlink-check
-Bandit
-BatchFTP
-BBBike
+Badass
+Battleztar Bazinga
+BDCbot
 BetaBot
-Bigfoot
+Bitacle
 Blackboard
 Black Hole
-BLEXBot
 Blow
-BlowFish
-Boardreader
+BotALot
+Brandprotect
 BuiltBotTough
+BunnySlippers
+Calculon
 CazoodleBot
 CCBot
 CheeseBot
+CherryPicker
+ChinaClaw
 Cliqzbot
+Cloud mapping
+coccocbot-web
+CODE87
+cognitiveseo
 Collector
-CopyRightCheck
+com.plumanalytics
+Cosmos
+Craftbot
 crawler.feedback
 crawl.sogou.com
-CrazyWebCrawler
-Crescent
-Custo
-CyotekWebCopy
 DatabaseDriverMysqli
-DBLBot
+DataCha0s
+demandbase-bot
 Demon
+Deusu
 Digincore
 DIIbot
-Disco
-DittoSpyder
+Discoverybot
 DomainCrawler
-DomainSigmaCrawler
 Domains Project
-DomainStatsBot
-DomCopBot
-Drip
-DSearch
-EasyDL
-EMail Wolf
+domainsproject.org
+Dragonfly
+DTS Agent
+ECCP/1.0
+Ecxi
+EMail Siphon
 EroCrawler
-evc-batch
 Express WebPictures
-Extreme Picture Finder
-EyeNetIE
 Ezooms
+facebookscraper
 Fimap
 Firefox/7.0
-FlashGet
-Foobot
-Fyrebot
-Genieo
+FrontPage
+GalaxyBot
 Getintent
-G-i-g-a-b-o-t
-gopher
-Grabber
+Gigablast
+Gigabot
+Gotit
+GoZilla
+GrabNet
 GrapeFX
-GridBot
 Haansoft
 HaosouSpider
 Harvest
-Havij
-HEADMasterSEO
-Heritrix
-IDBTE4M
+Hloader
+HTTP::Lite
+HybridBot
+IDBot
 IlseBot
-Image Fetch
-Image Sucker
-IndeedBot
-Indy Library
+Internet Ninja
 InternetSeer
 internetVista monitor
+Iria
 Iskanie
-IstellaBot
+JamesBOT
+JennyBot
 JetCar
+Jetty
 JikeSpider
-JustView
-Keyword Density
-Kinza
-Kozmosbot
+JOC Web Spider
+Jorgee
+Lanshanbot
+LexiBot
 Libwhisker
 LieBaoFast
 Lightspeedsystems
 Likse
-LinkextractorPro
-LinksManager
-LinkWalker
-Litemage_walker
-LNSpiderguy
+LinkpadBot
+LinqiaRSSBot
+Lipperhey
 Ltx71
-LWP::Simple
+lwp-request
+Magnet
 Mag-Net
-Mail.RU_Bot
-Masscan
-Mb2345Browser
-meanpathbot
-Microsoft URL Control
+magpie-crawler
+Majestic SEO
+MarkWatch
+mediawords
+MFC_Tear_Sample
+MIDown tool
 MIIxpc
-Mister PiX
-MJ12bot
 Moblie Safari
 MQQBrowser
+MSIECrawler
+Msrabot
+MTRobot
 muhstik-scan
 Name Intelligence
-Nameprotect
-Netcraft
+Needle
+Nessus
+netEstate NE Crawler
 NetLyzer
-Nibbler
-NICErsPRO
-Niki-bot
-Nimbostratus
-NPbot
-Nuclei
-Octopus
+NetMechanic
+Nettrack
+Net Vampire
+Netvibes
+NetZIP
+NimbleCrawler
+Nmap
+Nutch
+oBot
 Offline Explorer
-Offline Navigator
-OnCrawl
+Openfind
+OpenLinkProfiler
 OPPO A33
+OrangeBot
 OrangeSpider
-OutclicksBot
+OutfoxBot
 PageAnalyzer
-PageGrabber
+Page Analyzer
 page scorer
+PageScorer
 PageThing.com
-Pandalytics
-Pavuk
-pcBrowser
-Petalbot
+Panscient
 PHPCrawl
 Picscout
-Picsearch
-Piepmatz
-Pimonster
+PictureFinder
+Pi-Monster
+Pixray
+PleaseCrawl
 Pockey
+POE-Component-Client-HTTP
+polaris version
+probe-image-size
 Probethenet
-Psbot
-Pump
-PyCurl
-Quick-Crawler
-RankActive
+ProPowerBot
+ProWebWalker
+Pu_iN
+PxBroker
+RankActiveLinkBot
 RankingBot
-Rankivabot
 Reaper
 RebelMouse
+RedesScrapy
+Re-re
 Ripper
+ripz
 RocketCrawler
 Rogerbot
-RSSingBot
-SalesIntelligent
+s1z.ru
+scan.lol
 Scrapy
-ScreenerBot
+SemrushBot
+seobility
 SeobilityBot
-SEOkicks
 SEOprofiler
-seostar
-serpstatbot
+seoscanners
 sexsearcher
-Shodan
-SiteExplorer
+Sitebeam
+SiteCheckerBotCrawler
 Siteimprove
-SiteLockSpider
-SiteSnagger
 SiteSucker
 Site Sucker
 Sitevigil
-SmartDownload
-Snoopy
+SMTBot
+Snake
+Snapbot
 SocialRankIOBot
 sogouspider
-Sosospider
-Sottopop
 SpaceBison
-Spanner
+Spammen
 sp_auditbot
 Spbot
+Spinn3r
+SputnikBot
 spyfu
 Sqlmap
-Stripper
-Sucker
-SuperBot
+Steeler
+Sucuri
 SuperHTTP
-Surfbot
 SurveyBot
 sysscan
-T0PHackTeam
+Szukacz
+T8Abot
 tAkeOut
-Teleport
-TeleportPro
-Telesphorep
+Telesoft
+Telesphoreo
 TheNomad
 Toweyabot
-Trendiction
 Trendictionbot
-Turingos
-TurnitinBot
+trendiction.de
+TwengaBot
+Typhoeus
 URLy Warning
-Vacuum
-VelenPublicWebCrawler
-VidibleScraper
-Virusdie
+Vagabondo
+VB Project
+VCI
+VeriCiteCrawler
 Voltron
-voyagerx.com
 Wallpapers/3.0
-WallpapersHD
 WBSearchBot
-Webalta
-WebAuto
-WebBandit
+Web Auto
+WebCollage
+Web Collage
 WEBDAV
-WebFuck
+WebEnhancer
+WebFetch
+Web Fetch
+Web Fuck
 WebGo IS
-WebImageCollector
-WebPix
-Web Pix
-WebReaper
-Web Sauger
+WebLeacher
+webmeup-crawler
+WebSauger
 Webshag
-Webster
-WebStripper
-Web Sucker
+Website Quester
 WeSEE
-Whacker
-Widow
-WinHTTrack
-Wonderbot
-Woobot
-Wprecon
-WWWOFFLE
+Whatweb
+Who.is Bot
+WISENutbot
+WWW-Mechanize
+WWW::Mechanize
+Xaldon WebSpider
 Xaldon_WebSpider
 xpymep1.exe
-YoudaoBot
+Zade
 Zauba
-zauba.io
-Zermelo
+zgrab
 Zitebot
-ZyBorg
+ZoomBot
+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 77d34c539..47affd78f 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 @@
-alfa9.com
-cdncash.net
-domain2008.com
-gemgrab-a.akamaihd.net
-kalandranis.gr
-movpod.in
-pictures-and-images.net
-traffpartners.com
-vkontaktemusic.ru
-xn--lifehacer-1rb.com
+flirt4free.com
+hikesearch.net
+keywordsuggests.com
+narkologiya-voronezh.ru
+networkad.net
+rabot.host.sk
+serpstat.com
+serw.clicksor.com
+tomatis.gospartner.com
+volgograd.xrus.org
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index be9fe7e8c..ec10f9ef1 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 @@
-123locker.com
-123movies.love
-12masterov.com
-1688.com
-1-free-share-buttons.com
-1hwy.com
-23kw.ru
-24x7-server-support.site
-6128786.com
-72-news.com
-aac500b7a15b2646968f6bd8c6305869d7.com
-aadroid.net
-abiente.ru
-absolutelyanalog.com
+03p.info
+100dollars-seo.com
+1kinobig.ru
+300richmond.co.nz
+70casino.online
+aa14ab57a3339c4064bd9ae6fad7495b5f.com
+abcdefh.xyz
+abclauncher.com
+academiacsmendoza.org
+acmebtn.ml
+adclickservice.com
+adclickthru.net
+add-add.men
+adloads.com
+admeasures.com
+adobereader-free.ru
+adrenalin-stk.ru
+adsland.men
 ads-seo.men
-adultfriendfinder.com
-akama.com
-aktivator-windows10.blogspot.com
-akvamaster.dp.ua
-allornamenti.com
-allpdfmags.net
-allproblog.com
-an-donut.com
-animal-drawings.com
-animenime.ru
-anticrawler.org
+adtech.de
+adtology.com
+advancedcleaner.com
+affrh2015.com
+agreda.pluto.ro
+agysya.ru
+airmaxshoes-2016.com
+albamargroup.com
+alert-jdh.xyz
+allbizne.co.ua
+alphacarolinas.com
+animalia-life.club
 antons-transporte.de
-apifasterlightin-a.akamaihd.net
-apiitsthirteende-a.akamaihd.net
-apiwebwebgetcom-a.akamaihd.net
-appearance-cool.com
-applicationg29.com
+apartment.ru
+apibetweenlinesn-a.akamaihd.net
+apiportalmorecom-a.akamaihd.net
+appleid-verification.com
 approved.su
-arewater.com
-arkkivoltti.net
+apps-analytics.net
+arkartex.ru
+arquapetrarca.info
+artdestshop.eu
+artefakct.com
+asdfg.pro
+atlant-auto.info
+atley.eu.pn
 atofilms.com
-ausergrubhof.info
-autobrennero.it
-autoua.top
-b00kmarks.com
-balkanfarma.org
-bankcrediti.ru
-banki76.ru
-bank.uz
-bannerspace.com
-bard-real.com.ua
-beauty-bracelet.com
-berrymall.ru
-bestadbid.com
-bestcalovebracelet.cn
-best-seo-software.xyz
-betterhdporn.com
-bezcmexa.ru
-bigcareer.info
-bimatoprost-careprost.com.ua
-bitcoins-live.ru
-blackwitchcraft.ru
-blog.axant.it
-blogs.rediff.com
-bloke.com
-bonvillan.com
-bonzibuddi.com
-bookhome.info
-bookmark4you.com.biz
-boostmyppc.com
-bpro1.top
-brandedleadgeneration.com
-break-the-chains.com
-bristolhotel.com.ua
-bryansk.zrus.org
-budilneg.xyz
-buketeg.xyz
+autonew.biz
+aviav.org
+avon-novosib.ru
+ayeartoforget.com
+basedecor.ru
+beauty-b0x.pl
+becuo.com
+beget.tech
+bestkfiledxd.cf
+bestpriceninja.com
+bestwrinklecreamnow.com
+beta.hotkeys.com
+betterscooter.com
+bizru.info
+bkgr.se
+blog.f00kclan.de
+blog.koreadaily.com
+bmsco.co
+bmw-ark.ru
+bobba.dzaba.com
+brains2.biz
+braip.com.br
+brakehawk.com
+brandehk.dk
+brandimensions.com
+brateg.xyz
+brk-rti.ru
+buchananshardware.com
 bumble.cheapwebsitehoster.com
-businesxxl.com
-buypillsorderonline.com
-buyviagraa.blogspot.com
-buzzurl.jp
-cacheimages.com
-candelluxsklep.pl
-carson.getenjoyment.net
-cartierlovestore.com
-cascadelink.org
-ccjp.eu
-chastnoeporno.com
-chatroulette.online
-cheapjerseysbizwholesale.us
-choosecuisine.com
-cialischmrx.com
-cjmc.info
-cl.s7.exct.net
+bus-offer.com
+buyantiviralwp.com
+buybest1.biz
+buydissertation.net
+buypuppies.ca
+buzzonclick.com
+calcularpagerank.com
+callcafe.info
+callstevens.com
+camsex.xxx-cam.webcam
+casablancamanor.co.za
+castingbank.ru
+caulderwoodkennels.com
+cbcseward.com
+certifywebsite.win
+cheapjerseysa.com
+cheapmarmot.online
+cheapsergiorossi.online
+cheapwebsitehoster.com
+choice-credit.ru
+cinemaenergy-hd.ru
+cinemaflix.website
+citysecurity.nu
+clash-clans.ru
+cleanersoft.com
+clickprotects.com
 club-lukojl.ru
-com-onlinesupport.site
-compliance-fred.xyz
-compliance-ivan.top
-conboy.us
-coolbar.pro
-copypaste.traderzplanet.in
-costablue.xyz
-counter.yadro.ru
-crackguru.tk
-craftinsta.ru
-cranly.net
-credit-online.ws
-cubs-jerseys.us
-cyclobenzaprinevstizanidine.blogspot.com
-datract.com
-dear-diary.ru
-detsky-nabytek.info
-diffbot.com
-diminishedvalueoforegon.com
-discovertreasure-a.akamaihd.net
-discovertreasurenow.com
+collegeessay19.blogspot.ru
+compliance-brian.xyz
+compliance-irvin.top
+compliance-jack.top
+com-supportcenter.website
+conciergegroup.org
+coop-gamers.ru
+cowblog.fr
+cscwtalkto.site
+customergrowthsystems.com
+cvety24.by
+damasarenai.info
+daneshetabiat.com
+daretodonate.co
+darkages.info
+data1.scopich.com
+davebestdeals.com
+delitime.info
+dev33.dioniqlabb.se
+dikqlyremy.info
+discountliv.com
 divatraffic.com
-dogoimage.com
+divci-hry.info
+djekxa.ru
+dkvorota.ru
+dlya-android.org
+doctormakarova.ru
 dojki-hd.com
-domaincdn.xyz
-domainsatcost.com
-domznaniy.ru
-donna7753191.ru
-dood.live
-doreenblog.online
-downloadkakaotalk.com
-druzhbany.ru
-dwomlink.info
+dollartree.info
+download-walpaperhd.blogspot.com
+dptaughtme.com
+dtnlyss.com
 eandsgallery.com
-earl-brown.info
-easytuningshop.ru
-e-commerce-seo1.com
-elektroniksigaraankara.info
-elite-sex-finders.com
-elitesportsadvisor.com
-englishdictionaryfree.com
-enternet.ee
-eonpal.com
-erotag.com
-esnm.ru
-essayservicewriting.org
-euromasterclass.ru
-exmasters.com
-expolicenciaslatam.co
-extlinks.com
+e-buyeasy.com
+efkt.jp
+election.interferencer.ru
+electro-prom.com
+eloxal.ru
+encodable.com
+ereko.ru
+eropho.net
+esopini.com
+eu-cookie-law.info
+evrotekhservis.ru
+ewebarticle.info
 eyes-on-you.ga
-ezaz.info
-ezb.elvenmachine.com
-ezrvrentals.com
-f1nder.org
-facialporntube.com
-fashion.stellaconstance.co
-fatfasts-4tmz.com
+f07.de
+falopicm.pw
+fapgon.com
+favoritemoney.ru
 fearcrow.com
-femdom.twiclub.in
-ferretsoft.com
-fetroshok.ru
-fighrofacciufreesig.ga
-filesmonster.porn
-fiuxy.com
-flprog.com
-fodelsedagspresenter.nu
-food.dtu.dk
-foto-sisek.porngalleries.top
-fototravel.eu
-freecamdollars.com
-free-gluten.ru
-freewebs.com
-freshberry.com.ua
-frustrated-favorable.gq
+fickkontakte.org
+filesdatabase.net
+filmbokep69.com
+filmetricsasia.com
+floating-share-buttons.com
+floridamhca.org
+flowersbazar.com
+footbalive.org
+formulaf1results.blogspot.com
+foto-basa.com
+freefoto.ca
+freelotto.com
+freemags.cc
+freshdz.com
+front.ru
+fuckingawesome.com
 fuckmill.com
 fungamelands.com
-gambarkatabaru.com
-gamebackyard.com
-gamingspark.com
-gaygalls.net
-gayxperience.com
-geileweiber.tk
-gemara.com
-gerhardhealer.com
-germes-trans.com
-getprismatic.com
-gg-arena.ru
+fx-brokers-review.com
+fz139.ttk.ru
+g7m.pl
+gamerscorps.com
 gg.zzyjxs.com
-gigixo.com
-girlporn.ru
-girlsatgames.ru
-given2.com
-globalsurfari.com
-globetrotting-culture.ru
-glogow.pl
-goblacked.com
-gogalleryawesome.com
-gogps.me
-goldadpremium.com
-golfresa.lucania.se
-googlepositions.com
-googlsucks.com
-gopro-online.info
-greatzip.com
-gsasearchenginerankerdiscount.com
+glall.ru
+glicol.kz
+goodhousekeeping.com
+goodwinmetals.co
+googlefeud.com
+googleseo.com.tr
+gosreg.amchs.ru
+grizzlysgrill.com
 gsasearchengineranker.top
-gsmlab.pl
-guildebzh.info
-guod.me
+guitar-master.org
+gwebtools.com
+harmonyglen.us
+hausfrauensex18.com
 haveinc.xyz
-havepussy.com
-healmytrauma.info
-hentaiheroes.com
-himazin.info
-himgaws.pw
-hit-men.men
+hcate.com
+hdimagelib.com
+hitcpm.com
+hit-kino.ru
+hkladys.com
+hmywwogw.bloger.index.hr
 homeart.space
-homegardenlova.com
-homeinns.com
-hoporno.com
-horoshieokna.com
-hostcritique.com
-hotcore.info
-hotel-mkad.ru
-housemilan.ru
-htmlcorner.com
-hubbble.com
-hunthillfarmtrust.org
-ideashome.id
-ifirestarter.ru
+homedecoguide.info
+homedecorpicture.us
+homik.pw
+hop.clickbank.net
+houseofrose.com
+hoverboard360.nl
+humbmosquina.tk
+hunterboots.online
+husky-shop.cz
+hyipmanager.in
+ibmdatamanagement.co
 igru-xbox.net
 iklysha.ml
-ilo134uloh.com
-immigrational.info
-impotentik.com
-infektsii.com
-infodocsportal.com
-inome.com.ua
+imicrovision.com
+impisr.edunsk.ru
 interfucks.net
-investyb.com
-inzn.ru
-iomoio.net
-islamtoday.co.za
-ispaniya-costa-blanca.ru
-ix20.ru
-jackpotchances.com
-justucalling32211123456789.tk
+investzalog.ru
+istizanidineacontrolledsubstance.blogspot.com
+istripper.com
+j33x.com
+jacago.com
+jamiembrown.com
+jasonpartington.com
+je7.us
+jerseywholesalechinabiz.com
+jimmychoosale.online
+justbcause.com
+kaac.ru
+kadashihotel.com
+kamalsinha.com
 kam-dom.ru
-karusel-market.ru
-katadhin.co
-ketoanhanoi.info
-kevblog.top
-kinomaniatv.pl
-kinosed.net
-knowyournextmove.com
-konturkrasoty.ru
-kredit-blog.ru
-kredit-pod-zalog-krasnodar.ru
+karaganda.xkaz.org
+kerwinandcariza.com
+kinozapas.com
+kliksaya.com
+klin3952.ru
+kochanelli.com
+kongoultry.net
 kursy-ege.ru
-kutikomi.net
+kvartiry-remont.ucoz.ru
+kwzf.net
+laapp.com
 labafydjxa.su
-ladsblue.com
-lafourmiliaire.com
-leadn.pl
-lifehacĸer.com
-lignofix.ua
-limads.men
-lineavabit.it
-lion.misba.us
-lirunet.ru
-lollypopgaming.com
-lombardfinder.ru
-lombia.co
-long-beach-air-conditioning.com
-lsex.xyz
-ltvperf.com
-lulea-auktionsverk.se
-m1media.net
+landreferat.ru
+larger.io
+larutti.ru
+law-check-nine.xyz
+laxdrills.com
+le-clos-des-alouettes.com
+lenpipet.ru
+letmacworkfaster.site
+life.biz.ua
+liquimondo.com
+littlesunraiser.com
+liumimgx.pw
+liveinternet.ru
+localmatchbook.com
+low-format.ru
+luciddiagnostics.in
+m4ever.net
+mafcards.ru
 mahnwachen-helfen.info
-mailemedicinals.com
-mainlinehobby.net
-makemoneyonline.com
-marketland.ml
-markjaybeefractal.com
-matrixalchemy.com
-matsdale.com
-maximpartnerspr.com
-mediawhirl.net
-medicine-4u.org
-me-ke.com
-mere.host.sk
-metallosajding.ru
-mirtorrent.net
-mobile-appster.ru
-mole.pluto.ro
-monclerboots.xyz
-monclerjacketsoutlet.pw
-moncleroutletonline.xyz
-moneyviking-a.akamaihd.net
+makenahartlin.com
+makis.nu
+maladot.com
+malls.com
+manualterap.roleforum.ru
+marketingtechniques.info
+marsgatan.com
+medanestesia.ru
+med-zdorovie.com.ua
+mega-bony2017.pl
+megahdporno.net
+mega-polis.biz.ua
+megavolt.net.ua
+metascephe.com
+methodsmarketing.com
+m-google.xyz
+mhtr.be
+microsearch.ru
+mini-modus.ru
+mmstat.com
+mobplayer.net
+mockupui.com
+moncleronline.xyz
 monitorwebsitespeed.com
-mtmtv.info
-multgo.ru
-mundoaberrante.com
-mustat.com
-myfreecams.com
+monsterdivx.tv
+mossmesi.com
+mp3downloadhq.com
+mrbitsandbytes.com
+mttwtrack.com
+muzaporn.com
+muz-shoes.ru
+my-big-family.com
+mydeathspace.com
+mydirtyhobby.com
+myra.top
+myshopmatemac.com
 mywallpaper.top
-napalm51.nut.cc
-narkologiya-orel.ru
-naughtyconnect.com
-negral.pluto.ro
-net-profits.xyz
-nfljerseyscheapbiz.us
-o00.in
-o333o.com
-obiavo.su
-odoratus.net
-oecnhs.info
-offer.wpsecurity.website
-oklogistic.ru
-oktube.ru
-olgacvetmet.com
-olvanto.ru
-omoikiri-japan.ru
+na15.ru
+nakrutka.cc
+narosty.com
+nelc.edu.eg
+netcheckcdn.xyz
+networkcheck.xyz
+new-apps.ru
+new-post.tk
+nextbackgroundcheck.gq
+nomuos.it
+nordstar.pro
+nuup.info
+obesidadealgarve.com
+obiavo.in
+offergroup.info
+oivcvx.website
+okmedia.sk
+o.light.d0t.ru
+olympescort.com
 onemantrip.com
-online-x.ru
-onlythegames.com
-o-o-11-o-o.com
+onlinadverts.com
+oralsexfilme.net
 orgasmatrix.com
-orion-code-access.net
-oxotl.com
-paceform.com
-paleohub.info
-parfusale.se
-partner-pop.men
-partnersafe.men
-pawli.eu
-perm.xrus.org
-pharmacyincity.com
-picture-group.com
-pictures-and-images.net
-picturesify.com
-pijoto.net
-pinkduck.ga
-pix24x7.com
-plastgran.com
-platinumdeals.gr
-polcin.de
+osagonline.ru
+ossmalta.com
+ourville.info
+ownshop.cf
+ozas.net
+pc-services.ru
+perso.wanadoo.es
+picswe.com
+picturesboss.com
+piluli.info
+piski.top
+podshipniki-nsk.ru
+pogruztehnik.ru
 polytopesexempt.com
-porndairy.in
-pornmania.pl
-porno-raskazy.ru
-pornoreino.com
-porno-video-chati.ru
-postclass.com
-preg.marketingvici.com
-prohoster.info
-promalp-universal.ru
-ptr.ruvds.com
-pufip.com
-push-ad.com
-puzo2arbuza.ru
-quebec-bin.com
-questionmarque.ch
-raisedseo.com
-razvratnoe.org
-rcb101.ru
-realitykings.com
-recordpage-a.akamaihd.net
-redirectme.net
-refads.pro
-remontvsamare.su
-renecaovilla.online
-ricorsogiustizia.org
-ringtonepartner.com
-robot-forex.biz
-runofilms.ru
-ruscoininvest.company
+pony-business.com
+poppen-nw.net
+porngalleries.top
+pornhubforum.tk
+pornoelita.info
+pornosee.info
+pornoted.com
+portside.xyz
+pregnant.guru
+priceg.com
+princeadvantagesales.com
+priscilarodrigues.com.br
+privhosting.com
+prodess.ru
+promoforum.ru
+prospekt-st.ru
+pro-tec.kz
+proxyradar.com
+pr-ten.de
+psa48.ru
+puserving.com
+qld10000.net
+rada.ru
+ranking2017.ga
+rating-casino2021.ru
+rebelmouse.com
+regionshop.biz
+registratciya-v-moskve.ru
+remont-fridge-tv.ru
+renecaovillasale.online
+rogervivierforsale.com
+royalads.net
+royal-betting.net
+rrutw.com
+rubanners.com
+rusexy.xyz
+rusprostitute.com
 russian-postindex.ru
-rvzr-a.akamaihd.net
-santasgift.ml
-savememoney.co.za
-sawin.beth.webd.pl
-scanner-fred.top
-scanner-mary.top
-secret.xn--oogle-wmc.com
-securesmrt-dt.com
-semaltmedia.com
-seorankinglinks.us
-sextracker.de
-s-forum.biz
-shitmovs.com
-sierraapps.com
-simple-share-buttons.com
-sindragosa.comxa.com
-siteexpress.co.il
-siteheart.net
-sitopreferito.it
-slowmac.tech
-snip.tw
-soaksoak.ru
-sofit-dmd.ru
-soietvousmaime.fr
-soochi.co
-spb.ru
-speeddream.xyz
-startwp.org
+rybalka-opt.ru
+sad-torg.com.ua
+sale-japan.com
+sanatorrii.ru
+satoristudio.net
+scanner-donald.top
+scanspyware.net
+seansonline24.pl
+seasonvar.ru
+secretscook.ru
+sei80.com
+seoexperimenty.ru
+seo-platform.com
+service.adtech.us
+sex-tracker.de
+shopcheermakeup.info
+shoplvlv.us
+silvercash.com
+simply.net
+site-speed-checker.site
+sixcooler.de
+smart-scripts.com
+snts.shell-pmr.ru
+social-button.xyz
+soft-program.com
+sotechco.co
+souvenir.cc
+spbchampionat.ru
+sptslmtrafms.com
+standardchartered-forex.com
 starwars.wikia.com
-stauga.altervista.org
-storehouse.ua
-stroimajor.ru
-stroyhelp-dv.ru
-stroyplus.ru
-stuff-about-money.com
-suchenindeutschland.com
-sukirgenk.dvrlists.com
-superfish.com
+stickers-market.ru
+stillmiracle.com
+stockquotes.wooeb.com
+strag-invest.ru
+strfls.com
+sukarame.net
+summerlinhomes411.info
 supermama.top
-supermesta.ru
-supers.com.ua
+superstarfloraluk.com
 surffoundation.nl
-tabletkinaodchudzanie.com.pl
-tam-gde-more.ru
-tarad.com
+svnuppsalaorebro.se
+svtrd.com
+taaaak.com
+takeflyte.com
 technika-remont.ru
-tedxrj.com
-tengohydar.tk
-terrafootwear.us
-thegameriders.com
+tecspb.ru
+telegraf.by
+thejournal.ru
+thewebsitetemplate.info
 thewomenlife.com
-thin.me.pn
-timeallnews.ru
-tizanidinedosageforsleep.blogspot.com
-tizanidinepain.blogspot.com
-tizanidinerecreationaluse.blogspot.com
-tk-assortiment.ru
-tonerbox.kz
-torrentred.games
-trafficfactory.biz
-triplepanda.xyz
-truck-rece.life
-trustedmaccleaner.com
-tryrating.com
-tsyndicate.com
-tubo360.com
-tupper-shop.ru
-turkeyreport.tk
-tvorozhnaja-zapekanka-recept.ru
-twinderbella.com
-twu.com.ua
-typimga.pw
-ultramart.biz
-umityangin.net
-undergroundcityphoto.com
-unionmarkt.de
-unrealcommander.com
-uptimechecker.com
-uptime-gamma.net
-uroffer.link
-uytmaster.ru
-uzporno.mobi
-validdomain.xyz
-veles.shop
-vip-dom.in
-vizitki.net
-vkak.ru
-vkgaleria.com
-vk-mus.ru
-vkontarkte.com
-vltai.com
-volume-pills.biz
-vucms.com
-vzubah.com
-web-analytics.date
-weboptimizes.com
+threecolumnblogger.com
+thruport.com
+ticketsys.inetwd.com
+timecrimea.ru
+tizanidinehcl2mg.blogspot.com
+token-lab.org
+top-deal.com.pl
+torontoplumbinggroup.com
+traffic100.com
+trafficmania.com
+trion.od.ua
+truck-land.life
+tt-ipd.info
+tula.mdverey.ru
+twelvevisionspartyofcolorado.com
+udsgame.online
+ugguk.online
+univerfiles.com
+upstore.me
+uptime-as.net
+urengoy.pro
+urlopener.blogspot.com.au
+urzedowski.eu
+vacuumcleanerguru.com
+vbikse.com
+vepad.com
+vertaform.com
+vgoloveboli.net
+viagra.pp.ua
+viagra-soft.ru
+videochat.cafe
+videogamesecrets.com
+videospornogratisx.net
+viktoria-center.ru
+visa-pasport.ru
+vodaodessa.com
+voprosotvet24.ru
+vrotike.ru
+vse-pesni.com
+vut.com.ru
+wallpaperstock.net
+watchdogs-2.ru
+webads.co.nz
+webmasters.stackexchange.com
+webstatsdomain.org
 weburlopener.com
-weclipart.com
-welcomeauto.ru
-wholesalejerseychinaoutlet.com
-wikes.20fr.com
-wormix-cheats.ru
-writersgroup580.web.fc2.com
-wwwadultcheck.com
-www.timer4web.com
-wygraj-teraz.com
-xblog.in
-xdoza.com
-xn--80atua3d.xn--p1ai
-xn----ctbbcjd3dbsehgi.xn--p1ai
-xn--q1a.xn--b1aube0e.xn--c1acygb.xn--p1ai
-x-porno.video
-xtremeeagles.net
-xxxrus.org
-xzlive.com
-yeartwit.com
-yhit.press
-yourdesires.ru
-ypmuseum.ru
-za-fun-offer.com
-zaloadi.ru
-zeleznobeton.ru
-zeroredirect12.com
-zhacker.net
-zkjovpdgxivg.ga
-z-master.ru
-zmoda.hostreo.com
-zscalerone.net
-zvuker.net
-zzlgxh.com
+westen-v.life
+whatsappdownload10.com
+wheelchairliftsarea.com
+wineitudes.wordpress.com
+workle.website
+wovis.site
+wrona.it
+ww2awards.info
+www.souvenirua.com
+x5market.ru
+xmlinde.com
+xn----7sbho2agebbhlivy.xn--p1ai
+xn--80aaaks3bbhabgbigamdr2h.xn--p1ai
+xn--80adaggc5bdhlfamsfdij4p7b.xn--p1ai
+xtrafficplus.com
+yatrk.xyz
+yes-com.com
+yoopsie.com
+youresponsive.com
+yunque.pluto.ro
+yurgorod.ru
+zagadki.in.ua
+zakonobosago.ru
+zdesoboi.com
+zeroredirect1.com
+zeroredirect7.com
+zhongwenlink.com
+zigarettenonlinekaufen2.bloog.pl
+zigarettenonlinekaufen.tumblr.com
+zona-aqua.ru
+zrus.org
+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 33fac4d36..26799981a 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 @@
-08800.top
-123cha.com
+0n-line.tv
+11pikachu.ru
 123kuma.com
-1flag.co.za
-4ureyesonly.com
-6128786.com
-777-club.ru
-adcash.com
-adminshop.com
-adpremium.org
-adult-shop.com.ua
-advancedmassagebysara.com
-advancedsoftwaresupport.com
-aero2.ru
-alborzan.com
-alevinefesleri.com
+1qingdao.com
+7xc4n.com
+adanih.com
+addblueoff.com.ua
+agahinameh.com
+aksonural.ru
+alekseevec.ru
+alldownload.pw
 alltheviews.com
-amateurlivechat.org
-anti-virus-removal.info
-apioutoboxnet-a.akamaihd.net
+ameblo.top
+amehdaily.com
+anatomiy.com
+apibetweenlinesn-a.akamaihd.net
+apioasisspacenet-a.akamaihd.net
 appiq.mobi
-ap.senai.br
-architecturebest.com
-arraty.altervista.org
-ascat.porn
-asia-forum.ru
-asmxsatadriverin.aircus.com
-atlant-auto.info
-australia-opening-times.com
-avirasecureserver.com
-azte.ch
-baltgem.com
-bankiem.pl
-basisches-wasser.net
-bear.gotcher.us
-beetpics.pw
+appsecurityr.com
+arate.ru
+arendovalka.xyz
+atmagroup.ru
+auspolice.com
+ayodhya.co
+azbukadiets.ru
+bablonow.ru
+baixar-musicas-gratis.com
 best-deals-products.com
-best-way.men
-bget.ru
-biographiya.com
-bloggerads.net
-bluerobot.info
-blue-square.biz
-bonanza-fortune.men
-business-made-fun.com
-bus-offer.com
-buyhoverboard.com
-camel-beach.com
-canrole.com
+bestmarriages.com
+bibys.com
+bitporno.sx
+bracketsmackdown.com
+braip.com.br
+businescoop.men
+buy-cheap-pills-order-online.com
+buypanicdisorderpill.com
+candlehandmade.com
 casinopinup-wins.com
-ccjp.eu
-cctva.tv
+cdncash.com
+c-english.ru
+cete.ru
+chatroulette.life
 cheap-trusted-backlinks.com
-chidporn.com
-clips.ua.ac.be
-clothesforcash.com
-d2jsp.org
-darodar.com
-deanmoore.ie
-dekoration.us
-detmebel.su
-dieswaene.com
-dispo.de
-divatraffic.com
-docsportal.net
-domaincheck.io
-dvr.biz.ua
-e-kwiaciarz.pl
-eldiariodeguadalajara.com
-electrik-avenue.com
-elitedollars.com
-empirepoker.com
-en.altezza.travel
+chocoslim.pro
+chuckguilford.com
+cityadspix.com
+clarithromycin500mg.com
+clayvasedesigns.tk
+club-samodelkin.ru
+coolbar.pro
+coslab.club
+counter.bloke.com
+crazyprotocol.com
+cs-passion.pl
+cubs-jerseys.us
+customcollegeessays.net
+cwetochki.ru
+cymbaltaandtizanidine.blogspot.com
+dandiyabeats.in
+date-withme.com
+dealitright.click
+delfin-aqua.com.ua
+detskie-zabavi.ru
+dev.citetick.com
+dfwu1013.info
+doeco.ru
+ebonyporn.site
+eduinfosite.com
+egovaleo.it
+electro-prom.com
+elektrozigarette2.webs.com
+elektrozigaretten1.webs.com
+eloxal.ru
 ero-advertising.com
-ewebarticle.info
-exhibitionplus.eu
-eyes-on-you.ga
-ezigarettenshop1.yolasite.com
-fanoboi.com
-fantasticpixcool.com
-farm26.ru
-fifa-coins.online
-firstsiteguide.com
-fishtauto.ru
-fiverr.com
-food.dtu.dk
-forum.doctissimo.fr
-franklinfire.co
-freshmac.space
-gavuer.ru
-gdebestkupit.ru
-geilehausfrauen.net
-generalporn.org
-get-free-traffic-now.com
-gidonline.one
-globatur.ru
-go2jump.org
-go2mike.ru
-goforexvps.com
-gopixdatabase.com
-gov.yanao.ru
+erotikchat-24.com
+essaypro.com
+estibot.com
+euronis-free.com
+exchangeit.gq
+fireads.men
+flirt4free.com
+forex-indextop20.ru
+freakycheats.com
+free-gluten.ru
+frvo.alptandem.ru
+fun-mobi.pl
+gameprimary.com
+gamezblox.com
+gamingspark.com
+gate5.co.za
+gaytube.com
+gayxperience.com
+getlamborghini.ga
+get-seo-domain.com
+girlsfuckdick.com
+golden-praga.ru
+goroda-vsego-mira.ru
+gribkovye-zabolevaniya.com
+harmonyglen.us
+hdpixion.com
+healbio.ru
+hidefiles.org
 holidaypics.org
-hoverboard360.de
-idc.com.ua
-i-midias.net.br
-int.search.mywebsearch.com
-investingclub.ru
-investmac.com
-iron-age.info
-isistaylorporn.info
-je7.us
-jobmarket.com.ua
-joy-penguin.com
-kazan.zrus.org
-kinozapas.org
+homedecoguide.info
+hornymatches.com
+hosting-tracker.com
+hundejo.com
+hustoon.over-blog.com
+ilmen.net
+imgarit.pw
+infobabki.ru
+inmate-locator.us
+ispaniya-costa-blanca.ru
+istizanidineanarcoticdrug.blogspot.com
+ivanovo.zrus.org
+jagg.info
+javatex.co.id
+jrcigars.com
+jyrxd.com
+keywordglobal.co.za
+khafre.us
 kmd-pto.ru
-kochanelli.com
-kung-fu-ru.com
-lacloop.info
-ladsblue.com
-lankarns.com
-laptoper.net
-le-clos-des-alouettes.com
-letslowbefast.site
-lignofix.ua
-linkbolic.com
-live-sexcam.tk
+kollekcioner.ru
+koptims.tiu.ru
+kovrenok.ru
+kuzinsp.ru
+linkrr.com
+littleberry.ru
 lkbennettoutlet.online
-locustdesign.co
-lottospring.com
-mafcards.ru
-mararoom.ru
-medicine-4u.org
-megakino.net
-mere.host.sk
-micasainvest.com
-millionare.com
+mac-shield.com
+maximpartnerspr.com
+maxthon.com
+mebeldekor.com.ua
+mecash.ru
+meteostate.com
+midst.eu
 mmog-play.ru
-musicvidz.ru
-musirc.com
-mustat.com
+monclercoats.xyz
+monclervests.xyz
+monetizationking.net
+moneytop.ru
+moomi-daeri.com
+moxo.com
+mug-na-chas-moscow.ru
+musicspire.online
+musicstock.me
 mydoctorok.ru
-mylida.org
-mywallpaper.top
-naperehresti.info
-narkologiya-peterburg.ru
-na-telefon.biz
-needtosellmyhousefast.com
-neks.info
-netcheckcdn.xyz
-niki-mlt.ru
-nonameread45.live
-odywpjtw.bloger.index.hr
-onclkads.com
-onemactrckr.com
-optom-deshevo.ru
-orgasmus-virtual.com
-ostrovtaxi.ru
-pensplan4u.com
-photo.houseofgaga.ru
-piccshare.com
-picquery.com
-picsforkeywordsuggestion.com
-pinwallpaper.xyz
-pizda.lol
-plastgranar.nu
-pogosh.com
-porndl.org
-pornoinn.com
-princeadvantagesales.com
-priora-2.com
-privatefx.all4invest.info
-proposal-engine.com
-pyrodesigns.com.au
-rank-checker.online
-referencemoi.com
-relatodelpresente.com.ar
-reward-survey.net
-rollercoin.com
-rubanners.com
-santasgift.ml
-saratov.xrus.org
-scanner-don.top
+myfreecams.com
+myhydros.org
+nailsimg.com
+naj-filmy24.pl
+netallergy.ru
+next-dentists.tk
+nextrent-crimea.ru
+nowtorrents.com
+oballergiya.ru
+obiavo.kz
+offf.info
+onthemarch.co
+osnova3.ru
+ownshop.cf
+oyster-green.com
+par-fallen.ga
+partybunny.ru
+pcgroup.com.uy
+php-market.ru
+picsearch.com
+picturesify.com
+play-movie.pl
+polska-poezja.com
+popserve.adscpm.net
+popup.matchmaker.com
+pornohd1080.online
+pornosmola.info
+porno-transsexuals.ru
+positive2b.ru
+pozdrawleniya.ru
+preparevideosafesystem4unow.space
+prodess.ru
+prostitutki-belgoroda.org
+prostitutki-tolyatti.org
+pro-tec.kz
+ptr.ruvds.com
+rada.ru
+realresultslist.com
+rightenergysolutions.com.au
+rimedia.org
+rocketchange.ru
+sanyuprojects.com
+savingsslider-a.akamaihd.net
+scanmyphones.com
+scanner-alex.top
 scanner-fred.top
-scanner-ivan.top
-seofied.com
-serviporno.com
-sevenstars7.com
-sherlock.se
-shoppingmiracles.co.uk
-sibecoprom.ru
-silverage.ru
-sk.golden-praga.ru
-social-search.me
-sofit-dmd.ru
-sterva.cc
-stuff-about-money.com
-supermesta.ru
-surflinksmedical.com
-surintech.ac.th
-svetlotorg.ru
-tacbelarus.ru
-tackletarts.co
-telefonsexkostenlos.tk
-teslathemes.com
-thexart.club
-tizanidineandhydrocodone.blogspot.com
-tizanidineusedfor.blogspot.com
-tk-assortiment.ru
-tomatis.gospartner.com
-torrents.cd
-trumpetedextremes.com
-ttrraacckkrr.com
-tversvet.ru
-twodollarshows.com
-ublaze.ru
-u-cheats.ru
-ufa.xrus.org
-umaseh.com
-uptimechecker.com
-usdx.us
-v24s.net
-video-production.com
-viel.su
-vintontech.info
-vote-up.ru
-vrnelectro.ru
-vuclip.com
-warezkeeper.com
-watchmyfb.pl
-webinstantservice.com
-webjam.com
-webmasters.stackexchange.com
-wholesalenfljerseys.us.com
-wildcattube.com
-wingsofrefuge.net
-wma-x.com
-wrz0iuebwhp5fg.freeddns.com
-ws.ampower.me
-wsgames.ru
-www.kabbalah-red-bracelets.com
-xingzi-vision.com
-xn--80aikhbrhr.net
-xn--80ajbshivpvn2i.xn--p1ai
-xn--d1aifoe0a9a.top
-yun56.co
-yunque.pluto.ro
-zaapplesales.blogspot.com
-zeroredirect2.com
-zhuravlev.info
+scanner-jane.top
+secretscook.ru
+seorussian.ru
+seo-tools-optimizing.com
+serptehnika.ru
+sexy-pings.com
+shillyourcoins.com
+shlyahten.ru
+sildenafil-tadalafil.info
+sindragosa.comxa.com
+siteimprove.com
+smstraf.ru
+sneakyboy.com
+socialbuttons.xyz
+solicita.info
+soochi.co
+splendorsearch-a.akamaihd.net
+startwp.org
+staynplay.net
+suhanpacktech.com
+sukirgenk.dvrlists.com
+superiends.org
+surffoundation.nl
+tabletkinaodchudzanie.com.pl
+tattomedia.com
+telefonsexsofort.tk
+thepornsex.org
+thesmartsearch.net
+thetardistimes.ovh
+timer4web.com
+tizanidine4mgtablets.blogspot.com
+tizanidineandcipro.blogspot.com
+tizanidinenarcotic.blogspot.com
+tizanidinerecreationaluse.blogspot.com
+top-study.work
+torrentred.games
+tradedeals.biz
+twelvevisionspartyofcolorado.com
+uhodzalijami.ru
+uptimebot.net
+uptime-delta.net
+utiblog.fr
+vltai.com
+voloomoney.com
+vriel.batcave.net
+w7s.ru
+webix.me
+welck.octopis.com
+wnoz.de
+wrona.it
+xlolitka.com
+xn--80aaajbdbddwj2alwjieei2afr3v.xn--p1ai
+yourporn.com
+you-shall-not-pass.is74.ru
+zawyna.ua
+zrelaya.pw
+zscalerone.net
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index b2122ba99..f0474a154 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,11 +1,21 @@
-<html>
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
+</html><html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body>
 <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 7f6a65382..9a0a5abca 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.237.56.208	0;
+104.196.57.92	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index fb3ae9c57..3740f56e0 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 98e24a712..492614c38 100644
Binary files a/.latest_release/conf.d.tar.gz and b/.latest_release/conf.d.tar.gz differ