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 cc3de7218..87dc4782a 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 @@
-34.66.200.49	1;
+35.192.10.37	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 1d3684d1d..a5f544ae0 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 @@
-34.66.200.49	0;
+35.192.10.37	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 cc3de7218..87dc4782a 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 @@
-34.66.200.49	1;
+35.192.10.37	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 1d3684d1d..a5f544ae0 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 @@
-34.66.200.49	0;
+35.192.10.37	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 cc3de7218..87dc4782a 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 @@
-34.66.200.49	1;
+35.192.10.37	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 1d3684d1d..a5f544ae0 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 @@
-34.66.200.49	0;
+35.192.10.37	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..91396c033 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;
+34.66.200.49            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 66808fb4d..cc3de7218 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.188.15.155	1;
+34.66.200.49	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 82a85f46f..1d3684d1d 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.188.15.155	0;
+34.66.200.49	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 66808fb4d..cc3de7218 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.188.15.155	1;
+34.66.200.49	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 82a85f46f..1d3684d1d 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.188.15.155	0;
+34.66.200.49	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 66808fb4d..cc3de7218 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.188.15.155	1;
+34.66.200.49	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 82a85f46f..1d3684d1d 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.188.15.155	0;
+34.66.200.49	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 1df7835ed..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
-35.192.10.37            0;
-35.202.245.105          0;
+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 33d268f92..59dd925a9 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;
+35.202.245.105          0;
 34.66.50.208            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 47e27f55d..62a91c825 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
-34.66.200.49            0;
 35.192.10.37            0;
-34.66.25.221            0;
+34.66.50.208            0;
+34.66.200.49            0;
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index cc3de7218..87dc4782a 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	1;
+35.192.10.37	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 4ec95f5b3..17fcf9174 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 @@
-Bitacle
-CherryPicker
-DomainCrawler
-Ltx71
-Mass Downloader
-netEstate NE Crawler
-RankActive
-RankurBot
+GalaxyBot
+Iblog
+IRLbot
+IstellaBot
+LinkpadBot
 RebelMouse
-VB Project
+Sitevigil
+SocialRankIOBot
+Sosospider
+Vacuum
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index f88d2ccbf..ceaef2d91 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
-80legs
+Abonti
 Aboundex
-Aboundexbot
+Acunetix
 ADmantX
-AfD-Verbotsverfahren
+AhrefsBot
 AiHitBot
 Aipbot
-AllSubmitter
-AlphaBot
+Alexibot
 Ankit
-arquivo.pt
-AwarioRssBot
+archive.org_bot
+autoemailspider
+AwarioSmartBot
 BackDoorBot
-BackStreet
-BBBike
-BetaBot
-Bitacle
+backlink-check
+BacklinkCrawler
+BatchFTP
+Battleztar Bazinga
+BDCbot
+BDFetch
 Blackboard
-BlackWidow
 BLEXBot
-Blow
-Boardreader
-Bolt
 BotALot
 Brandprotect
-Buddy
-Bullseye
-BunnySlippers
 Calculon
-check1.exe
-CheeseBot
+CazoodleBot
+CensysInspect
+CherryPicker
 CheTeam
+Chlooe
 Claritybot
 Cloud mapping
+coccocbot-web
+CODE87
 cognitiveseo
-com.plumanalytics
-Copier
+CopyRightCheck
 Copyscape
-Cosmos
 Craftbot
 crawler4j
-CrazyWebCrawler
+crawler.feedback
+crawl.sogou.com
 CrunchBot
 CSHttp
 Curious
 Custo
-CyotekWebCopy
+DatabaseDriverMysqli
 DataCha0s
-Demon
-Devil
+demandbase-bot
+Deusu
 DIIbot
-Dirbuster
-Discoverybot
 Dispatch
-DittoSpyder
 DomainAppender
-DomainCrawler
 DomainStatsBot
 DomCopBot
-Dotbot
 DSearch
-DTS Agent
-eCatch
-ECCP/1.0
-EMail Siphon
+Ebingbong
 EroCrawler
-Exabot
-Express WebPictures
-ExtLinksBot
-Extractor
-facebookscraper
-FHscan
-Fimap
+Evil
+Flunky
 Foobot
+Freeuploader
+FrontPage
 Fuzz
 GalaxyBot
-GermCrawler
+Genieo
 Getintent
-GetRight
+Gigabot
+Go-Ahead-Got-It
+gopher
 GoZilla
-Go!Zilla
-Grafula
-GridBot
+Grabber
+GrabNet
+GrapeshotCrawler
 GT::WWW
 Haansoft
-Havij
-HEADMasterSEO
-HMView
-Humanlinks
+heritrix
+Heritrix
+Hloader
 IDBot
-IDBTE4M
-Image Fetch
+Id-search
 Image Sucker
-Indy Library
 InfoNaviRobot
 InfoTekies
-instabid
-internetVista monitor
+InterGET
+Iria
+IRLbot
+isitwp.com
+Iskanie
+JamesBOT
 JennyBot
-JetCar
 Joomla
 Jorgee
-JustView
-Kenjin Spider
 Keyword Density
-Kozmosbot
 Larbin
-LeechFTP
 LeechGet
-LieBaoFast
-Lightspeedsystems
+Lftp
+Likse
+Linkbot
 LinkextractorPro
-LinkpadBot
+LinkScan
 LinqiaRSSBot
-LinqiaScrapeBot
+Lipperhey
+Lipperhey Spider
 Litemage_walker
-Lmspider
+Ltx71
 lwp-request
+LWP::Simple
 Magnet
-Mail.RU_Bot
-Majestic12
-Majestic-SEO
+magpie-crawler
+Majestic SEO
 MarkMonitor
+MarkWatch
+Masscan
+Mass Downloader
 Mata Hari
-meanpathbot
+Meanpathbot
+Mediatoolkitbot
 mediawords
-Microsoft Data Access
-MIIxpc
+MegaIndex.ru
+Metauri
 Moblie Safari
-Mr.4x3
-MSFrontPage
-Msrabot
-MTRobot
+Mojeek
+Mojolicious
+Morfeus Fucking Scanner
+Mozlila
 Musobot
 Name Intelligence
 Nameprotect
-Navroad
+NearSite
 Nessus
-Nibbler
+Netcraft
+netEstate NE Crawler
+NetSpider
+Net Vampire
+NextGenSearchBot
+Niki-bot
 NimbleCrawler
-Ninja
-Offline Explorer
-Openfind
+Octopus
+OnCrawl
 OpenLinkProfiler
-Openvas
-OutfoxBot
-page scorer
+OPPO A33
+PageGrabber
 PageScorer
 PageThing.com
-Pandalytics
-Pavuk
+Panscient
+pcBrowser
+PECL::HTTP
+PeoplePal
 Petalbot
-PHPCrawl
-Picscout
 Picsearch
-Pimonster
+PictureFinder
+Piepmatz
+Pi-Monster
 Pixray
-RankActive
-RankActiveLinkBot
+POE-Component-Client-HTTP
+ProPowerBot
+ProWebWalker
+Psbot
+Pu_iN
+PxBroker
 RankFlex
-RankingBot
 Rankivabot
-RebelMouse
-RepoMonkey
 Ripper
+ripz
+RocketCrawler
 RSSingBot
-SalesIntelligent
-ScanAlert
-Scanbot
-scan.lol
-ScoutJet
-Screaming
-ScrepyBot
-Searchestate
-Semrush
+satoristudio.net
+Scrapy
+ScreenerBot
+SearchmetricsBot
+SemrushBot
+SentiBot
 seobility
-SEOkicks-Robot
-Seomoz
+SeobilityBot
+SeoSiteCheckup
 SEOstats
+sexsearcher
 Shodan
-Siphon
-SISTRIX
-Sitebeam
 SiteCheckerBotCrawler
-SiteExplorer
 Siteimprove
 SiteLockSpider
+SiteSnagger
+SiteSucker
 Site Sucker
-Sitevigil
-SMTBot
-Snake
-SocialRankIOBot
-sogouspider
+Snoopy
+Sosospider
+Sottopop
 SpaceBison
+SpankBot
 Spanner
-sp_auditbot
-SputnikBot
-Sucker
-Sucuri
-SuperBot
-sysscan
+Spbot
+Spinn3r
+spyfu
+Sqworm
+Steeler
+Surfbot
+SurveyBot
+Suzuran
+Swiftbot
 Szukacz
 T0PHackTeam
 T8Abot
+tAkeOut
 TeleportPro
+Telesoft
 Telesphoreo
-Telesphorep
+The Intraformant
 TheNomad
+TightTwatBot
 Toata
-Turnitin
-TwengaBot
-Twice
-Typhoeus
-Upflow
-Vagabondo
-VelenPublicWebCrawler
+Trendiction
+trendiction.de
+Turingos
+VCI
+VeriCiteCrawler
 Virusdie
-VoidEYE
-WallpapersHD
+Voltron
 Webalta
+WebAuto
 Web Auto
 WebBandit
 Web Collage
+WEBDAV
 Web Enhancer
-WebFetch
+Web Fetch
+WebFuck
 Web Fuck
-WebGo IS
 WebImageCollector
-webmeup-crawler
+WebLeacher
+Web Pix
 WebReaper
-WebSauger
+Web Sauger
+Webshag
 WebsiteExtractor
 Webster
-Web Sucker
 WebWhacker
+WeSEE
+Whatweb
 Widow
-Woobot
+WinHTTrack
+WiseGuys Robot
 WWW-Collector-E
-WWW-Mechanize
 WWW::Mechanize
-Xaldon WebSpider
-xpymep1.exe
+x22Mozilla
+Xaldon_WebSpider
 YoudaoBot
+Zade
 zauba.io
 Zermelo
-Zeus
-ZoomBot
+ZoominfoBot
+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 ea55965b8..31fbe3ccd 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
 404checker
 404enemy
+80legs
 Aboundexbot
 ADmantX
 AhrefsBot
-Anarchie
-Anarchy
+AiHitBot
+Alexibot
+AllSubmitter
+AlphaBot
+Ankit
 Apexoo
 archive.org_bot
+Aspiegel
 ASPSeek
 autoemailspider
 AwarioRssBot
 AwarioSmartBot
-BackDoorBot
-Backlink-Ceck
-BackWeb
+backlink-check
+BacklinkCrawler
+BackStreet
 BDCbot
-Blackboard
+Bitacle
 Black Hole
 BlackWidow
-Boardreader
-Buddy
+BLEXBot
+BotALot
+Brandwatch
+Buck
+Bullseye
+BunnySlippers
 BuzzSumo
-Calculon
-CCBot
-Cegbfeieh
+CazoodleBot
 CensysInspect
-CheeseBot
+check1.exe
+CherryPicker
+CheTeam
+ChinaClaw
 Chlooe
 Cloud mapping
 coccocbot-web
 Cocolyzebot
+CODE87
 cognitiveseo
-Copyscape
+Collector
+com.plumanalytics
+CopyRightCheck
 Cosmos
+Craftbot
 crawler4j
 CrunchBot
-CSHttp
 CyotekWebCopy
 DatabaseDriverMysqli
-DataCha0s
 DBLBot
 Digincore
 DigitalPebble
-Dirbuster
-Disco
-Discoverybot
-DomainAppender
-DomainCrawler
-DomainSigmaCrawler
-Domains Project
-domainsproject.org
-DomCopBot
-Dragonfly
+DIIbot
+Dispatch
+DomainStatsBot
+Dotbot
+Drip
 DSearch
-DTS Agent
 EasyDL
-Ebingbong
-eCatch
-ECCP/1.0
-Ecxi
 EMail Siphon
-Extreme Picture Finder
+evc-batch
+Exabot
+ExtLinksBot
 EyeNetIE
 Ezooms
 FHscan
 Fimap
-Firefox/7.0
-FrontPage
+Foobot
+FyberSpider
 Fyrebot
 GalaxyBot
 Genieo
-GermCrawler
-Getintent
-GetRight
-GetWeb
+G-i-g-a-b-o-t
+Go-Ahead-Got-It
 Gotit
 GoZilla
-Grabber
 Grafula
-GrapeFX
 GrapeshotCrawler
+HaosouSpider
+Havij
+HEADMasterSEO
 heritrix
 Heritrix
-HTMLparser
+Hloader
 HTTP::Lite
-Iblog
+Humanlinks
+HybridBot
 IlseBot
+Image Fetch
 Image Sucker
-IndeedBot
 InfoTekies
 instabid
-Intelliseek
-InterGET
 InternetSeer
 internetVista monitor
-Iskanie
-Jbrofuzz
-Jetty
-Jorgee
+JennyBot
+JOC Web Spider
+Joomla
 JustView
 Jyxobot
-Lanshanbot
-LeechFTP
+Kenjin Spider
+Kozmosbot
+Larbin
+LeechGet
 Libwhisker
-Linkdexbot
-LinksManager
+LinkpadBot
+LinkScan
 LinqiaMetadataDownloaderBot
 LinqiaScrapeBot
 Lipperhey
 Lipperhey Spider
-Litemage_walker
-LNSpiderguy
-lwp-request
+Lmspider
 lwp-trivial
-Magnet
-magpie-crawler
-Mail.RU_Bot
-Majestic SEO
+Majestic-SEO
 MarkMonitor
-Mass Downloader
-MauiBot
-Mb2345Browser
-mediawords
-MFC_Tear_Sample
-MIIxpc
-Mojeek
-Morfeus Fucking Scanner
-Mozlila
+Meanpathbot
+Mediatoolkitbot
+MicroMessenger
+Microsoft URL Control
+MIDown tool
 MQQBrowser
+Mr.4x3
 MSFrontPage
-Msrabot
+MSIECrawler
+muhstik-scan
 Name Intelligence
-Needle
 Nessus
-NetAnts
 Netcraft
-NetLyzer
 NetMechanic
-Net Vampire
-NICErsPRO
-Niki-bot
-NPbot
+NextGenSearchBot
+Nikto
 oBot
-Octopus
+Offline Navigator
 Openfind
-Openvas
-OpenVAS
-OPPO A33
-OrangeBot
-OutclicksBot
-OutfoxBot
-Page Analyzer
+PageAnalyzer
 PageGrabber
 page scorer
-PageThing.com
-Pandalytics
-pcBrowser
-PECL::HTTP
+Papa Foto
 Petalbot
-Picscout
-PictureFinder
-plumanalytics
+Picsearch
+Piepmatz
+Pimonster
+Pi-Monster
+Pixray
+PleaseCrawl
 Pockey
+probe-image-size
 ProPowerBot
+ProWebWalker
+Psbot
 Pu_iN
-Pump
-RankActiveLinkBot
-RankurBot
-RebelMouse
+PyCurl
+RankActive
+RankFlex
+RankingBot
+RealDownload
 ReGet
-Re-re
+RepoMonkey
+Ripper
 ripz
 RocketCrawler
-Rogerbot
-SalesIntelligent
-satoristudio.net
-ScanAlert
+scan.lol
 Scrapy
 ScreenerBot
 ScrepyBot
-Searchestate
-SentiBot
-seobility
-SEOkicks
+SearchmetricsBot
+Semrush
+SemrushBot
+SeobilityBot
 Seomoz
 SEOprofiler
-seoscanners
-SEOstats
+seostar
+sexsearcher
+Shodan
+Siphon
+SISTRIX
+Sitebeam
 SiteExplorer
-Siteimprove
-SiteLockSpider
 siteripz
-SiteSnagger
 SiteSucker
-SmartDownload
-Snake
-Snapbot
+SMTBot
 Snoopy
-Sogou web spider
-Sosospider
-SpaceBison
+Sociscraper
+sogouspider
+Sottopop
+Spammen
 sp_auditbot
-Spbot
-Spinn3r
+spyfu
 Sqlmap
 Stripper
 Sucker
+Sucuri
 SuperHTTP
 Surfbot
+SurveyBot
+Suzuran
 Swiftbot
 Szukacz
-tAkeOut
-Teleport
-Telesoft
+TeleportPro
+Telesphoreo
 Telesphorep
+The Intraformant
+Thumbor
 Trendiction
-Trendictionbot
 trendiction.com
-True_Robot
+trendiction.de
 Turingos
-URLy.Warning
-Vacuum
+TwengaBot
+Typhoeus
+Upflow
+V-BOT
 VCI
-VelenPublicWebCrawler
+VidibleScraper
 Virusdie
 voyagerx.com
 WallpapersHD
+Webalta
+WebAuto
+Web Auto
 WebCollage
-Web Collage
-WebCopier
 WebEnhancer
+Web Enhancer
 WebFetch
-WebLeacher
+Web Fetch
+Web Fuck
+WebImageCollector
+webmeup-crawler
 WebReaper
+WebSauger
 Web Sauger
-Webshag
-WebZIP
+WebsiteQuester
+WebWhacker
 Whack
-Whatweb
-Widow
+Whacker
+Who.is Bot
+WinHTTrack
 WiseGuys Robot
 WISENutbot
+Wprecon
+WWW-Mechanize
+WWWOFFLE
 Xaldon WebSpider
-xpymep1.exe
+Xenu
 YoudaoBot
-zauba.io
-zgrab
-ZmEu
+Zauba
+Zitebot
+ZumBot
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 1cc3f5e82..c1e47aa3a 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 @@
-azarttoto.com
-canrole.com
-dptaughtme.com
-free-laptop-reward.com
-juliaworld.net
-seo-smm.kz
-students-cheapskate.ml
-tourismvictoria.com
-womama.ru
-xn--80ab4aa2g.xn--p1ai
+accessoires-mode.in
+apioutoboxnet-a.akamaihd.net
+dating-time-now.com
+gombita.info
+gsmlab.pl
+no-rx.info
+purplestats.com
+superkanpo.com
+xaijo.com
+xtube.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 4cbb5987e..0f822e098 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 @@
-08800.top
+01apple.com
+03e.info
+0lovespells0.blogspot.com
 101flag.ru
-12masterov.com
-178evakuator178.ru
-1pamm.ru
-2020iscoming.info
-2drittel.de
-2itech.ru
-5elementov.ru
+1688.com
+1adult.com
+1millionusd.xyz
+3rbseyes.com
+3w24.com
+4ureyesonly.com
 7a2rnuey1tw9ar.ru
-98oi.ru
-aa8780bb28a1de4eb5bff33c28a218a930.com
-addblueoff.com.ua
-adultnet.in
-adviceforum.info
+7zap.com
+8si.ru
+999webdesign.com
+abclauncher.com
+abovetherivernc.com
+academiacsmendoza.org
+acheterviagrafr24.com
+acortarurl.es
+adconscious.com
+adserver-e7.com
+ageofclones.com
+agreda.pluto.ro
 aksonural.ru
-aktivator-windows10.blogspot.com
-albuteroli.com
-alert-jdh.xyz
-alfa-img.com
-alldubai.biz
+aktobe.xkaz.org
+alessandraleone.com
+all4invest.ru
+allcredits.su
+allpdfmags.net
+alltheviews.com
 alpharma.net
-alta-realestate.com
-amanda-porn.ga
-anaseracresar.tk
-android-vsem.org
-angel1777.kz
-angkortours.vn
-animali.deagostinipassion.it
-animaltoplist.com
-anticrawler.org
-apidiamondatanet-a.akamaihd.net
-apioutoboxnet-a.akamaihd.net
+am15.net
+amehdaily.com
 apple.com-cleaner.systems
 apple.com-webbrowsing-security.review
-ardimobileinfo.ml
-arpelsreplica.xyz
-atleticpharm.org
-awaybird.ru
-azinoofficial777.ru
-backgroundpictures.net
-balans.shahterworld.org
-balitouroffice.com
-bbsoldes.fr
-bdsmgalls.net
-beauty-clinic.ru
-berlininsl.com
-best-seo-offer.com
-bg6s0.com
-biglistofwebsites.com
-bildsuche.ru
-bio-market.kz
-bitcoin-ua.top
-biteg.xyz
-blackle.com
-blockworld.ru
-blog.f00kclan.de
-blog.koreadaily.com
-blog.yam.com
-board.f00d.de
-boleznikogi.com
-bolitgorlo.net
-bosefux.esy.es
-brakehawk.com
-bravegirlsclub.com
-bupropion-sr-150-mg.us
-buyclomidonlaine.com
-buydissertation.net
-buyhoverboard.com
-buytizanidineonline.blogspot.com
-bvlgaribracelet.xyz
-bwlx.prepedu.cn
-carapics.com
-cartierreplica.pw
-cb.iphantom.com
-cejewelry.xyz
-centrumcoachingu.com
+app-ready.xyz
+appsecurityr.com
+aruplighting.com
+asrv-a.akamaihd.net
+asseenontv.ru
+autodo.info
+autovideobroadcast.com
+autowebmarket.com.ua
+avek.ru
+aviav.eu
+aviva-limoux.com
+avtochehli.by
+awency.com
+azbukadiets.ru
+backlink4u.net
+bag77.ru
+bagsonsale.online
+bavsac.com
+bedcapdealers.com
+belinvestdom.by
+best-games.today
+bestsexyblog.com
+best-way.men
+bibys.com
+biketank.ga
+bikini-image.com
+bin-brokers.com
+bizcheapjerseyswholesalechina.com
+blackbabesporn.com
+blackhatworth.com
+blogrankers.com
+bmw-ark.ru
+bocoarchives.org
+brainboosting.club
+brianhenry.co
+bristolhostel.com
+burger-imperia.com
+buy-meds24.com
+bycontext.com
+calcularpagerank.com
+candypeople.se
+candytiner.com
+cannibalcheerleader.com
+cartierlovebracelet.xyz
+cartierloveringreplica.xyz
+catalogs-parts.com
 chatroulette.life
-cheapsergiorossi.online
-checktext.org
-chelyabinsk.xrus.org
-chocolateslim-en-france.com
-christianlouboutinshoes.xyz
-chuckguilford.com
-cialischmrx.com
-classicakuhni.ru
-cleanallspyware.com
+cheapbarbour.online
+cheapcigarettesc.info
+cheapestjerseysonwholesale.com
+cheapmoncler.pw
+cheatcode-lita12.rhcloud.com
+checkm8.com
+cherubinimobili.it
+cialisndbrx.com
+cityadspix.com
+cleanpcnow.com
 clickpapa.com
-clicksor.net
-collegerentals.com
-comeondog.info
-compliance-irvin.top
-compliance-jess.top
-compliance-mark.top
-compucelunlock.net
-concordexoticrentals.com
-constantaservice.net
-contextualyield.com
-coolyarddecorations.com
-coslab.club
-counter.bloke.com
-crazyboost.pro
-creatives.adbetclickin.pink
-credit.co.ua
-cupday.com
-custodieva.ru
-daooda.com
-dentfidemountpreach.tk
-deshevo-nedorogo.ru
-digilander.libero.it
-digital-video-processing.com
-divisioncore.com
-documentbase.net
-dogsrun.net
-domain2008.com
-domaincheck.io
-dosug-lux.ru
-doxyporno.com
+coldfilm.ru
+comissionka.net
+compliance-andrew.xyz
+compliance-brian.xyz
+compliance-donald.xyz
+compliance-don.xyz
+cookielawblog.wordpress.com
+corta.co
+costablue.xyz
+cryptoswap.biz
+cubs-jerseys.us
+customcollegeessays.net
+cwetochki.ru
+datadepths.com
+ddlmega.net
+detskie-zabavi.ru
+deutschehobbyhuren.net
+dildofotzen.net
+diminishedvalueoforegon.com
+discountbarbour.online
+dmmspy.com
+doeco.ru
+dollartree.info
+domainsatcost.com
+dominateforex.ml
+domination.ml
+domini.cat
+downloaddy.net
 dscaas.website
-dtm-spain.com
-e90post.com
-ecommerce-seo.com
-econom.co
-efkt.jp
-ekaterinburg.xrus.org
-elektrischezigarettekaufen2.cowblog.fr
-elektrozigarettekaufen2.blogse.nl
+dumpsmania24.com
+earncash.com.ua
+ebonyporn.site
+educontest.net
+ekn-art.se
+elektrozigaretten2.yn.lt
+elmacho.xyz
 emailaccountlogin.co
-enge-fotzen.info
-enpolis.ru
-eredijovon.com
-erotische-geschichten-xxl.com
-expdom.com
-ezb.elvenmachine.com
-ezigarettekaufen2.blox.pl
-f07.de
-facebook-mobile.xyz
-fandlr.com
-fapgon.com
+erotik0049.com
+essayassist.com
+evening-dating-club.info
+exchanges-bet.com
+eyelike.com.ua
+ezigarettekaufen.myblog.de
+ezigaretteshop.webs.com
+factorynightclub.com
+familyphysician.ru
 faracontrol.ir
-ferrotodo.com
-findclan.org
-findthe.pet
-fitfloponline.store
-fivedwld.cf
-flashahead.info
-f-loaded.de
-fm-upgrade.ru
-folowsite.com
+fetlifeblog.com
+filesclub.net
+filesvine.com
+filmidivx.com
+financepoints.eu
+finuse.com
+flirt4free.com
+floridamobilebillboards.com
 food.dtu.dk
-footbalive.org
-foxjuegos.com
-freelinkbuilding.website.tk
-freenode.info
-free-social-buttons.xyz
-friendflnder.com
-game300.ru
-gazporno.com
-gaz-voshod.ru
-gerhardhealer.com
-getlaid-xxxhookupdirect.com
-gettpromos.com
-gidonline.one
-glavprofit.ru
-good-mummy.ru
-googglet.com
-googlsucks.com
-goosefishpost.bid
-goroda-vsego-mira.ru
-gotorussia.com
-gpirate.com
-greatdealshop.com
-gsmlab.pl
-gsou.cf
-gwebtools.com
-hamptonoaks.ca
-handsandlegs.ru
-hatedriveapart.com
-hccoder.info
-hermesbelts.xyz
-hikesearch.net
-himazin.info
-hmmm.cz
-hobild.net
-hollywoodactress.info
-homelygarden.com
-horoshieokna.com
-hotblog.top
-hotenergy.ru
-hotxnights.info
-hoverboard360.nl
-hoztorg-opt.ru
-hplaserjetpdriver8y.pen.io
-hubbble.com
-humanelydrew.com
-idegenvezeto.eu
-ilikevitaly.com
-ilmen.net
-inbabes.sexushost.com
-incest-ru.com
-indiakino.net
-inet-traffic.com
-infokonkurs.ru
-insta-add.pro
-instasexyblog.com
-insurple.com
-int.search.mywebsearch.com
-iqoption.pro
-istanbulit.com
-ixora.pro
-janavibekken.no
-jasonpartington.com
-javstock.com
-jav-way.site
-jerseychinabizwholesale.us
-jimmychoosale.online
-joyceblog.top
-kadashihotel.com
-kakablog.net
+forodvd.com
+forum69.info
+foto-weinberger.at
+frankofficial.ru
+freecamdollars.com
+free-fbook-traffic.com
+free-share-buttons.com
+freesitetest.com
+fuckmill.com
+fxund.us
+g7m.pl
+galaxy-family.ru
+galeon.com
+gallictures.com
+gamerscorps.com
+gateway.zscalerone.net
+gavuer.ru
+gcup.ru
+gdebestkupit.ru
+gelezki.com
+germes-trans.com
+germetiki.com.ua
+getresponse.com
+get-your-social-buttons.info
+gg-arena.ru
+gifspics.com
+glall.ru
+globalsurfari.com
+glogow.pl
+goldadpremium.com
+goo.ne.jp
+gosmeb.ru
+gov.yanao.ru
+grtyi.com
+gsasearchenginerankerdiscount.com
+gsasearchengineranker.site
+gwagka.com
+gz2.bbsoldes.fr
+havepussy.com
+hazardky.net
+hdxnxxtube.mobi
+hifidesign.ru
+hildinghr.se
+histats.com
+hkladys.com
+hledejvshopech.cz
+holidaypics.org
+homedecorpicture.us
+homegardenlova.com
+hoterika.com
+houston-vikings.com
+howlongdoestizanidinestayinyoursystem.blogspot.com
+howtowhitenteethfast.xyz
+hscsscotland.com
+hspline.com
+impotentik.com
+incolors.club
+indiasourcemart.in
+infodocsportal.com
+infogame.name
+informatiecentro.be
+infoupdate.org
+internet-apteka.ru
+iplusbit.blogspot.co.za
+ivoiretechnocom.ci
+janettabridal.com
+japan-bearings.ru
+jaxcube.info
+jerseysbizwholesalecheap.com
+jobgirl24.ru
+jovencitas.gratis
+jwcialislrt.com
+kamalsinha.com
 kam-dom.ru
-karaganda.xkaz.org
-katushka.net
-kellyonline.xyz
-kinogonew.ru
+keenoutlet.online
+kemerovo.zrus.org
+kiinomaniak.pl
+kinobest.pl
 kinohall.ru
-kino-rf.ru
-kirov.zrus.org
-klejonka.info
-knogg.net
-kolotiloff.ru
-koversite.info
-kovrenok.ru
-krasula.pp.ua
-kvartira-sutochno.com
-labplus.ru
-lacasamorett.com
-landmania.ru
-languagecode.com
-layola.biz.tc
-ldrtrack.com
-lidoradio.com
-linkwithin.com
-livefixer.com
-liveu.infoteka.hu
-loadopia.com
-locationdesaison.com
-lolnex.us
-lombia.co
-lottospring.com
-louboutinbooties.xyz
-lowephotos.info
-lsex.xyz
-lyngdalhudterapi.no
-lyrics.home-task.com
-macdamaged.space
-macnewtech.com
-magazintiande.ru
-mailemedicinals.com
-makenahartlin.com
-mansiondelrio.co
-marketland.ml
-marktforschung-stuttgart.com
-medmajor.ru
-mielec.pl
-miniads.ca
-mir-business-24.ru
-mirtorrent.net
-mixtapetorrent.com
-mmofreegames.online
-mmostrike.ru
-mncrftpcs.com
-mobicover.com.ua
-mobsfun.net
-mojpreskumanie.com
-monarchfind-a.akamaihd.net
-moncleroutletonline.win
-morepoweronmac.trade
-moscow.online-podarki.com
-movpod.in
-moxo.com
-moyakuhnia.ru
+kit-opt.ru
+kleine-titten.biz
+koleso24.com.ua
+kollekcioner.ru
+kosova.de
+krasivoe-hd.net
+kriokomora.info
+kskjco.club
+labelwater.se
+lafourmiliaire.com
+lapolis.it
+ledpolice.ru
+legionalpha.com
+lego4x4.ru
+letolove.ru
+lexiangwan.com
+libertybilisim.com
+life.biz.ua
+likrot.com
+linerdrilling.com
+link.ac
+liquimondo.com
+liveinternet.ru
+lovelycraftyhome.com
+lunchrock.co
+lutherstable.org
+macfix.life
+machicon-akihabara.info
+machicon-ueno.info
+makis.nu
+map028.com
+maranbrinfo.com.br
+matpre.top
+mecash.ru
+medicinacom.ru
+medizinreisen.de
+meetingrainstorm.bid
+member-quiz.com
+metallosajding.ru
+metalonly.info
+mex-annushka.ru
+mhi-systems.ru
+moesen-ficken.com
+monclerjacketsoutlet.pw
+money-every-day.com
+moneymaster.ru
+mosdverka.ru
 mp3ringtone.info
-mriyadh.com
-msfsaar.de
-mtmtv.info
-muz-tracker.net
-myanyone.net
-mydearest.co
-mylesosibirsk.ru
-myliveblog.ru
-myonigroup.com
-mywallpaper.top
-nardulan.com
-naturalshair.site
-naturtreenspicerx.pw
-new-apps.ru
-noclegonline.info
-notebook-pro.ru
-nrv.co.za
-ofanda.com
-offtime.ru
-offtopic.biz
-ohmyrings.com
-okeinfo.online
-onemactrckr.com
-onlineku.com
-onlinewritingjobs17.blogspot.ru
-o-o-6-o-o.ru
-outpersonals.com
+mrlmedia.net
+mulberryoutletonlineeu.com
+music.utrolive.ru
+my-bc.ru
+myfreetutorials.com
+nac-bearings.ru
+narkologiya-belgorod.ru
+narkologiya-voronezh.ru
+narosty.com
+nastydollars.com
+naturalbreakthroughsresearch.com
+netallergy.ru
+newstaffadsshop.club
+nikhilbahl.com
+niki-mlt.ru
+nisuturnetdgu.tk
+npoet.ru
+obsessionphrases.com
+oksrv.com
+online247.ml
+onlineserialy.ru
+oralsexfilme.net
+osoznanie-narkotikam.net
+ostrovtaxi.ru
+owohho.com
+paceform.com
+page2rss.com
+pammik.ru
 panchro.co.uk
-par-fallen.ga
+paradontozanet.ru
+paramountmarble.co.uk
+partner-pop.men
 partnersafe.men
-pattersonsweb.com
-pewit.pw
-pflexads.com
-photo-clip.ru
+parvezmia.xyz
+paydayloanslocal.com
+pc-test.net
 piccshare.com
-picturesmania.com
+picphotos.net
+pics-group.com
 pills24h.com
-piter.xrus.org
-pizdopletka.club
-playfortuna-play.ru
-pl.id-forex.com
-poquoson.org
-porndairy.in
-porno-chaman.info
-pornofiljmi.com
-pornogig.com
-pornohd1080.online
-porno-play.net
-pornosexrolik.com
-pornstartits.xblog.in
-porn-w.org
-porto.abuilder.net
-professionalwritingservices15.blogspot.ru
-profit-opportunity.com
-prostitutki-yaroslavlya.org
+pipki.r.acdnpro.com
+pivka.xyz
+pixelrz.com
+plastgranar.nu
+pliks.pl
+pod-muzyku.club
+pokemongooo.ml
+polytopesexempt.com
+popander.mobi
+poptool.net
+pornolook.net
+pr0fit-b0x.com
+presleycollectibles.com
+prizefestival.mobi
+professionaldieselcare.com
+promgirldresses.xyz
+promodj.com
+propranolol40mg.blogspot.com
+prostitutki-tolyatti.org
 proxyradar.com
-ptr.ruvds.com
+psa48.ru
+pshare.biz
+psvita.ru
+purplestats.com
 pushdata.sendpulse.com
-puzzleweb.ru
-quickbuck.com
-rapidsites.pro
-rcb101.ru
-renecaovillasale.online
-repeatlogo.co.uk
-replicaclub.ru
-responsive-test.net
-rethinkwasteni.info
-rialp.getenjoyment.net
-rightenergysolutions.com.au
-ritlweb.com
-roleforum.ru
-rostov.xrus.org
-royal-betting.net
-royalvegascasino.com
-rozalli.com
-rusenvironmental.net
-rusoft-zone.ru
-rvtv.ru
+puteshestvennik.com
+qexyfu.bugs3.com
+q-moto.ru
+rankexperience.com
+ranksonic.com
+ranksonic.org
+raschtextil.com.ua
+realizmobi.com
+redhotfreebies.co.uk
+reimageplus.com
+rent2spb.ru
+reversing.cc
+ric.info
+riders.ro
+royalads.net
+royal-investments.net
+running-line.ru
+ruscopybook.com
+russian-postindex.ru
+rvzr-a.akamaihd.net
+ryetaw.com
 s1z.ru
-sakhboard.ru
-sarf3omlat.com
-savememoney.co.za
-scanmarine.info
-scanner-alex.top
-scanner-brian.top
-scanner-jane.top
-scanner-josh.top
-scanspyware.net
-scat.porn
-scenarii-1-sentyabrya.uroki.org.ua
-sdsjweb.com
-searchaddis.com
-search.alot.com
-securesmrt-dt.com
+sady-urala.ru
+safe-app.net
+sawin.beth.webd.pl
+sbdl.no
+sbf441.com
+scanner-donald.top
+scanner-jessica.top
+score-ads.men
+sdrescher.net
+search.1and1.com
+searchimage.co
+se.bnt-team.com
 seeingmeerkat.com
-segol.tv
-selectads.men
-seoboxes.com
-seocheckupx.com
-servisural.ru
-sexsaoy.com
-sexy.babes.frontend-stack.top
-sexyebonyteen.com
-sexyteens.hol.es
-sexytrend.ru
-shakhtar-doneck.ru
-shama-rc.net
+seemoreresultshu-a.akamaihd.net
+semaltmedia.com
+seogadget.ru
+seokicks.de
+seo-prof1.xyz
+serviporno.com
+sevendays.com.ua
+sexkrasivo.net
+sharebutton.net
+shariki-zuma-lines.ru
+shijian.ac.cn
+shiksabd.com
+shivafurnishings.com
 shodanhq.com
-shoesonlinebuy.cn
-shoesonlinebuy.xyz
-sivs.ru
-s-iwantyou.com
-slowmacfaster.trade
-slowmac.tech
-socialbutton.xyz
-social-vestnik.ru
-softwaretrend.net
-sonata-arctica.wz.cz
-soochi.co
-souvenirua.com
-soviet-portal.do.am
-statoutlook.info
-steebook.com
-stop-gepatit.te.ua
-stpolice.com
-strana-krasoty.ru
-sumo.com
-superfish.com
-superkanpo.com
-svtrd.com
-swimpool.ca
-tasteidea.com
-tattoo33.ru
-taxi-v-eisk.ru
-td-l-market.ru
-teastory.co
-teenfuck.tv
-templates.radiodigital.co
-thaismartloan.com
-thecoral.com.br
-thefds.net
-thenetinfo.com
-thetattoohut.com
-tiandeural.ru
-ticketsys.inetwd.com
-tizanidineandhydrocodone.blogspot.com
-tizanidinecapsules.blogspot.com
-tizanidinecost.blogspot.com
-tizanidinedosageforsleep.blogspot.com
-tizanidinemusclerelaxant.blogspot.com
-tnctrx.com
-tobeyouday.win
-topsy.com
-torrents.cd
-totu.us
-tryrating.com
-ttsq.fr
+shopcheermakeup.info
+shymkent.xkaz.org
+sientalyric.co
+sierraapps.com
+simple-image.com.ua
+simplepooltips.com
+sinel.info
+sixcooler.de
+skincrate.net
+smailik.org
+sms2x2.ru
+socialbookmarksubmission.org
+sofit-dmd.ru
+sogimlecal.tk
+soheavyblog.com
+spabali.org
+space2019.top
+space-worry.ml
+sportbetfair.com
+sport-video-obzor.ru
+stair.registrydomainservices.com
+start.myplaycity.com
+strag-invest.ru
+swinginwithme.ru
+t3chtonic.com
+taximytishi.ru
+telesvoboda.ru
+tengohydar.tk
+tetracsaudi.com
+thenews-today.info
+tizanidine4mguses.blogspot.com
+tizanidineandcipro.blogspot.com
+tizanidineshowupondrugtest.blogspot.com
+tizanidinestreetvalue.blogspot.com
+tizanidinevssoma.blogspot.com
+tjkckpytpnje.com
+tonivedu.it
+top10-way.com
+topvidos.ru
+totu.info
 tube8.com
-tversvet.ru
-tvnewsclips.info
-tzritel.tk
-uac.net.au
-uchebavchehii.ru
-uchil.net
-uhodzalijami.ru
-ukrobstep.com
-uogonline.com
-upupa.net
-varikozdok.ru
-vepad.com
-vezuviy.su
-via-gra.webstarts.com
-viberdownload10.com
-videochat.life
-video-production.com
-vitalads.net
-vkgaleria.com
-voltrknc1.com
-vote-up.ru
-vroze.com
-vtcdns.com
-vucms.com
-vzglyadriv.kg
-w3javascript.com
-watsonrealtycorp.com
-web-betting.ru
-webcamtalk.net
-webenlace.com.ar
-webinstantservice.com
-webjam.com
-webshoppermac.com
-wellcome2slovenia.ru
-whereiskentoday.com
-winner7777.net
-woman-orgasm.ru
-womens-journal.net
-wordpresscore.com
-writersgroup580.web.fc2.com
-ww2awards.info
-www.arenda-yeisk.ru
-xn----7sbho2agebbhlivy.xn--p1ai
-xn----9sbubg3ambdfl1j.xn--p1ai
-xn--b1addnj3cah.xn--p1ai
-xn--c1acygb.xn--p1ai
-xn----ctbbcjd3dbsehgi.xn--p1ai
-xsfetish.org
+tula.howotorg.ru
+typimga.pw
+ukrtvory.in.ua
+umnovocaminho.com
+unlimitdocs.net
+upproar.com
+urldelivery.com
+us-america.ru
+vacuumcleanerguru.com
+vegan-foods.us
+ventelnos.com
+viagraneggrx.com
+viagroid.ru
+vids18.site
+viktoria-center.ru
+vilingstore.net
+villakohlanta.nu
+vip2ch.com
+visionwell.com.cn
+vizag.kharkov.ua
+vladhistory.com
+voprosotvet24.ru
+vsdshnik.com
+vuclip.com
+vysigy.su
+vzube.com
+walkme.com
+warezaccess.com
+warningzscaler.heraeus.com
+webkeyit.com
+webmasters.stackexchange.com
+webnode.me
+win-spy.com
+winwotgold.pl
+winx-play.ru
+wordkeyhelper.com
+worldhistory.biz
+worldlovers.ru
+writingservices17.blogspot.ru
+ws.ampower.me
+www.timer4web.com
+www.wohnkabinen-shop.de
+wygraj-teraz.com
+x-diesel.info
+xn----8sbhefaln6acifdaon5c6f4axh.xn--p1ai
+xn--b1agm2d.net
+xn--e1aggki3c.xn--80adxhks
+xn----itbkqkfiq.xn--p1ai
+xnxx-n.com
+xtraffic.plus
+xxxasianporn.net
+xxxrus.org
+xxxsiterips.xyz
+yaoguangdj.com
+yebocasino.com
 yebocasino.co.za
-youbloodyripper.com
-yougetsignal.com
-yourmovies.pl
-youtubedownload.org
-zacreditom.ru
-zaimite.ru
-zaloro.com
-zeroredirect10.com
-zhongwenlink.com
-zhuravlev.info
-zionstar.net
+youjizz.com
+youthreaders.com
+youtoner.it
+yuarra.pluto.ro
+zajm-zalog-krasnodar.ru
+zapatosenventa.info
+zarenica.net
+zeikopay.com
+zeleznobeton.ru
+zoomovies.org
+zoosexart.com
+zx6.ru
+zytpirwai.net
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 d5e147f08..2a668f6bb 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
-1hwy.com
-256bit.by
-3xforum.ro
-4replicawatch.net
-6128786.com
-8lufu.com
-8si.ru
-a96527gi.beget.tech
-aa8b68101d388c446389283820863176e7.com
-agecheckadult.com
-akusherok.ru
-alf-img.com
-allbizne.co.ua
-amt-k.ru
-anabolics.shop
-ananumous.ru
-androids-store.com
-android-systems.ru
-apartment.ru
-apimegabrowsebiz-a.akamaihd.net
-a.pr-cy.ru
+03p.info
+1008.su
+101billion.com
+1-free-share-buttons.com
+1kinobig.ru
+2nt.ru
+3th.co.in
+3weekdiet.com
+4senses.co
+5ws.dating-app.ru
+83net.jp
+8xv8.com
+adultfullhd.com
+adultgalls.com
+advokateg.ru
+afslankpillen2017nl.eu
+akuhni.by
+anaksma.info
+anlimebel.kiev.ua
+apartmentbay.ru
+apimountainbikei-a.akamaihd.net
 arclk.net
-arcteryxstore.online
 ardimobileinfo.ml
-asrvrep-a.akamaihd.net
-asseenontv.ru
-autolombard-krasnodar.ru
-bannerads.de
-bazaronline24.ru
-bestcurs.org
-bestempresas.es
-best-seo-solution.com
+arenanews.com.ua
+artel116.ru
+asscenihotosidea.blogspot.co.za
+aversis.net
+azartniy-bonus.com
+azbuka-mo.ru
+betterscooter.com
+bfz.biz
 bin-brokers.com
-boazpower.com
-bolitgorlo.net
-brus-vsem.ru
-buyclomidonlaine.com
+bioca.org
+bjanshee.ru
+blog.koreadaily.com
+bonzybuddy.com
+brendbutik.ru
+cakemediahq.com.au
 cakesplus.com.au
-call-of-duty.info
-callstevens.com
-candypeople.se
 carmuffler.net
-casinorewards.info
+cartierwatch.xyz
+cartujano-pre.de
 cdncash.com
-centraletermice.us
-cfacarrosserie74.com
-chee-by.biz
-chidporn.com
-clickzzs.nl
-clmforexeu.com
-compliance-ivan.xyz
-conocer-sanabria.com
-coolgamechannel.com
-craftburg.ru
-czeshop.info
-deanmoore.ie
-decorationspcs.com
-deplim.com
-depositfiles-porn.ga
-deshevo-nedorogo.ru
-dildofotzen.net
-discountbarbour.online
-dokfilms.net
-dominterior.org
-dosugrostov.site
-download-walpaperhd.blogspot.com
-earl-brown.info
-earncash.com.ua
-e-biznes.info
-efnor-ac.com
-eldiariodeguadalajara.com
-elite-sex-finders.com
-enthuse.computernetworksonline.com
+cfjump.com
+cfsrating.sonicwall.com
+chatroulette.video
+cheatcode-lita12.rhcloud.com
+cialischstgerts.com
+ciekawinki.pl
+cjmc.info
+cleanersoft.com
+clipartnew.com
+clothesforcash.com
+communisave.co.za
+coolyarddecorations.com
+country-chic.ru
+damedingel.ya.ru
+decoratinghomes.ga
+digital-sale.su
+dispo.de
+dostavka-v-krym.com
+eandsgallery.com
+eaplay.ru
+ecookna.com.ua
+electrik-avenue.com
+elektir.ru
+elektrischezigarette1.blog.pl
+el-nation.com
+emerson-rus.ru
+energy-ua.com
+engines-usa.com
+eropornosex.ru
+erotag.com
 essayassist.com
-eurosamodelki.ru
-everflora.ru
-expertnaya-ocenka.ru
-face.hostingx.eu
-fashion.stellaconstance.co
-fba-mexico.com
-feel-planet.com
-felizporno.com
-ferieboligkbh.dk
-fickkontakte.org
-fidelityfunding.com
-figuringmoneyout.com
-flashahead.info
-fym.com.ru
-gallerylisting.com
-genericviagrasildenafiled.net
-getresponse.com
-googlepositions.com
-gopro-online.info
-graphics8.info
-greendream.com.ua
-hannasolution.ru
-hcate.com
-herehloadibs.cf
-homik.pw
+everytalk.tv
+ezigarettekaufen1.hpage.com
+ezigarettekaufen2.blox.pl
+ezigarettekaufen2.yolasite.com
+failingmarriege.blogspot.com
+family1st.ca
+fashionindeed.ml
+fast-wordpress-start.com
+faz99.com
+femdom.twiclub.in
+filkhbr.com
+flavors.me
+flowersbazar.com
+forum.doctissimo.fr
+freshberry.com.ua
+fuckmill.com
+funnel.co.za
+g7m.pl
+ge0ip.com
+ghernnqr.skyrock.com
+girlsfuckdick.com
+goldadpremium.com
+gonextmedia.com
+greenzaim.ru
+gsasearchengineranker.pw
+hazardky.net
+hermesreplica.win
+highstairs-a.akamaihd.net
+hop.clickbank.net
+hoporno.com
 hostsshop.ru
-hotcore.info
-hoztorg-opt.ru
-hybrid.ru
-ilte.info
-import-sales.com
-incolors.club
-investmac.com
-ip-guide.com
-javcoast.com
-jerseyschinabizwholesale.us
-jrcigars.com
-kaidalibor.de
-kakablog.net
-keywordspay.com
-knigonosha.net
-konica.kz
-krasivoe-hd.com
-kreativperlen.ch
-laptoper.net
-laxdrills.com
-letto.by
+humanorightswatch.org
+ihtec2019.org
+incanto.in.ua
+intellego.info
+iopeninghours.co.uk
+irkutsk.zrus.org
+ixora.pro
+javlibrary.cc
+jestr.org
+jofucipiku.tk
+jovencitas.gratis
+jwcialislrt.com
+kam-dom.ru
+karaganda.xkaz.org
+karting196.ru
+kinohit1.ru
+knogg.net
+lacloop.info
+lineshops.biz
+linkbux.ru
+lion.misba.us
+listiseltemournlan.gq
 liveu.infoteka.hu
 lkbennettoutlet.online
-lubetube.com
-lunchrock.co
-m0r0zk0-krava.ru
-m292.info
-menetie.ru
-michaelkorsoutlet.store
-mmofreegames.online
-mojaocena.com
-monarchfind-a.akamaihd.net
-monarhs.info
-monclerboots.xyz
-monclercheap.xyz
-moncleroutletonline.win
-moncleroutletonline.xyz
-monsterdivx.com
-mrbojikobi4.biz
-muabancantho.info
-musicas.baixar-musicas-gratis.com
-my-big-family.com
-my-floor.in.ua
-myfreemp3.eu
-nacap.ru
-naj-filmy24.pl
-naturalbreakthroughsresearch.com
-negral.pluto.ro
-new-post.tk
-normalegal.ru
-notfastfood.ru
-nudo.ca
-obiavo.ru
-obsessionphrases.com
-omgtnc.com
-onlinemeetingnow.com
-online-zaymy.ru
-optitrade24.com
-orhonit.com
-partnerworkroom.men
-paydayonlinecom.com
-pechikamini.ru
-pflexads.com
-picphotos.net
+lombia.co
+longadventure.com
+lsex.xyz
+lutherstable.org
+mafcards.ru
+malls.com
+mega-polis.biz.ua
+microstatic.pl
+millionare.com
+mmog-play.ru
+mockupui.com
+moetomnenie.com
+mojowhois.com
+mrcsa.com.au
+muizre.ru
+myfreecams.com
+mylesosibirsk.ru
+myplaycity.com
+myseoconsultant.com
+naturalshair.site
+naturtreenspicerx.pw
+netcheckcdn.xyz
+newyorkhotelsmotels.info
+osb.se11.ru
+ostroike.org
+ownshop.win
+ozoz.it
+paphoselectricianandplumber.com
+percin.biz.ly
+photorepair.ru
 picturesboss.com
-porno.simple-image.com.ua
-pornotubs.com
-porodasobak.net
-powc.r.ca.d.sendibm2.com
-priceg.com
-primedice.com
+pizdeishn.com
+pl.id-forex.com
+pokemon-go-play.online
+porndairy.in
+pornoklad.net
+pornoklad.ru
+pornoted.com
+pravoholding.ru
+preconnubial.usuby.site
+professionaldieselcare.com
 profit-opportunity.com
-propranolol40mg.blogspot.com
-prostitutki-novgoroda.org
-proxyradar.com
-ranksonic.com
+quickchange.cc
+quickloanbank.com
 rapidokbrain.com
-rating-casino2021.ru
-rebuildermedical.com
-redhotfreebies.co.uk
-regdefense.com
-renewablewealth.com
-rniaeba.ga
-runstocks.com
-sack.net
-searchtooknow-a.akamaihd.net
-semprofile.com
+recordpage-a.akamaihd.net
+restorator-msk.ru
+rff-cfal.info
+rockprogblog.com
+rosbalt.com.ua
+russia-tao.ru
+sammyweaver.com
+savingsslider-a.akamaihd.net
+sbtdesign.co.uk
+scanner-julia.top
+sdelai-prosto.ru
+securesmrt-dt.com
+sel-hoz.com
+semp.net
+senger.atspace.co.uk
+seofirmreviewsus.info
 seorank.info
-sexobzor.info
-sexy.babes.frontend-stack.top
-sierraapps.com
-similardeals.net
-site-analyzer.com
-smichovbike.cz
-snsdeainavi.info
+sextracker.be
+shtaketniki.ru
+siha.de
+smallseotools.com
+snyatie-lomki-v-stacionare.ru
+socialbuttons.xyz
+social-fun.ru
+socialmonkee.com
 softonicads.com
-splendorsearch-a.akamaihd.net
-spymac.net
-srgwebmail.nl
-stard.shop
-stopnarco.ru
-svarkagid.com
-svtrd.com
-tarad.com
-teencastingporn.com
-teguh.info
-textads.men
-thebestweightlosspills.ovh
-thegioixekhach.com
-theguardlan.com
-thelottosecrets.com
-tizanidinehcl2mg.blogspot.com
-tizanidinesideeffectsweightloss.blogspot.com
-tjkckpytpnje.com
-topads.men
-tourismvictoria.com
-tracksurf.daooda.com
-trackzapper.com
-trafficmania.com
-trafficstars.com
-tsan.net
-turvgori.ru
-uptime-alpha.net
-uptime-gamma.net
-verymes.xyz
-viandpet.com
-vipps.com.my
-viteonlusarezzo.it
-vizag.kharkov.ua
-vkak.ru
-w3data.co
+spywareit.com
+steelmaster.lv
+stoki.ru
+stpicks.com
+stroyplus.ru
+suchenindeutschland.com
+suralink.com
+taboola.com
+telefonsexsofort.tk
+titan-ads.life
+tsyndicate.com
+tula.howotorg.ru
+ua.tc
+upproar.com
+upstore.me
+urengoy.pro
+uroffer.link
+usadacha.net
+vabasa.inwtrade.com
+varikozdok.ru
+vasileostrovsky-rayon.ru
+viddyoze.com
+vigrx-original.ru
+visa-china.ru
+vksaver-all.ru
+vseigru.one
+vzlomsn.org
 wallpaperaccess.com
-wallpaperstock.net
-webtherapy.ru
-whereiskentoday.com
-womens-journal.net
-womensplay.net
-www.labves.ru
-xjlottery.com
-xn--l1aengat.xn--p1ai
-xxx-cam.webcam
+wallpapers-best.com
+walpaperlist.com
+webalan.ru
+wieseversa.no
+withstandingheartwarming.com
+world-mmo.com
+wrona.it
+wsgames.ru
+wufak.com
+xaylapdiendanang.com
+x-lime.com
+xmronta.com
+xn--e1afanlbnfckd7c3d.xn--p1ai
+xn--q1a.xn--b1aube0e.xn--c1acygb.xn--p1ai
+xnxx699.com
 xzlive.com
-yellowstonesafaritours.com
-zakon-ob-obrazovanii.ru
-zapiszto.pl
-zeroredirect7.com
-zryydi.com
-zygophyceous.womanstars.site
+yougame.biz
+youtubedownload.org
+yuweng.info
+zaapplesales.blogspot.com
+zhorapankratov7.blogspot.com
+zvooq.eu
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index b2122ba99..3656720f2 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>
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index b2122ba99..3656720f2 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>
diff --git a/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index 1d3684d1d..a5f544ae0 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	0;
+35.192.10.37	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 83ccb4f63..71cc0f1eb 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 70828968a..aaf81a922 100644
Binary files a/.latest_release/conf.d.tar.gz and b/.latest_release/conf.d.tar.gz differ