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 87dc4782a..fb87e15aa 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.192.10.37	1;
+35.196.158.85	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 a5f544ae0..755513aa7 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.192.10.37	0;
+35.196.158.85	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 87dc4782a..fb87e15aa 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.192.10.37	1;
+35.196.158.85	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 a5f544ae0..755513aa7 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.192.10.37	0;
+35.196.158.85	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 87dc4782a..fb87e15aa 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.192.10.37	1;
+35.196.158.85	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 a5f544ae0..755513aa7 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.192.10.37	0;
+35.196.158.85	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 91396c033..719bd636b 100644
--- a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +45,4 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-34.66.200.49            0;
+35.196.72.151           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 cc3de7218..866a53036 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	1;
+35.196.72.151	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 1d3684d1d..118499141 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	0;
+35.196.72.151	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 cc3de7218..866a53036 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	1;
+35.196.72.151	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 1d3684d1d..118499141 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	0;
+35.196.72.151	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 cc3de7218..866a53036 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	1;
+35.196.72.151	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 1d3684d1d..118499141 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-34.66.200.49	0;
+35.196.72.151	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
index 6b7e34e66..a49f3d1b8 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,4 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-34.66.200.49            0;
-104.197.122.201         0;
+35.227.97.188           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 59dd925a9..09ffce01c 100644
--- a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.202.245.105          0;
-34.66.50.208            0;
+35.196.72.151           0;
+35.237.56.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 62a91c825..ce63e1ad4 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,6 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.192.10.37            0;
-34.66.50.208            0;
-34.66.200.49            0;
+35.237.56.208           0;
+34.74.79.111            0;
+35.196.72.151           0;
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 87dc4782a..fb87e15aa 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	1;
+35.196.158.85	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 17fcf9174..34390c6a5 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 @@
-GalaxyBot
-Iblog
-IRLbot
-IstellaBot
-LinkpadBot
-RebelMouse
+Discobot
+DSearch
+Extreme Picture Finder
+MIIxpc
+RSSingBot
+sexsearcher
 Sitevigil
-SocialRankIOBot
-Sosospider
-Vacuum
+Sottopop
+V-BOT
+Web Fuck
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index ceaef2d91..cf9173a2a 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
+80legs
 Abonti
 Aboundex
-Acunetix
 ADmantX
 AhrefsBot
 AiHitBot
-Aipbot
-Alexibot
-Ankit
+AllSubmitter
+AlphaBot
+Anarchie
+Anarchy
+Apexoo
 archive.org_bot
-autoemailspider
-AwarioSmartBot
-BackDoorBot
+Asterias
+Attach
+AwarioRssBot
+Backlink-Ceck
 backlink-check
-BacklinkCrawler
-BatchFTP
+Badass
 Battleztar Bazinga
+BBBike
 BDCbot
-BDFetch
-Blackboard
+BlackWidow
 BLEXBot
-BotALot
+Blow
+Bolt
 Brandprotect
-Calculon
+Buddy
+BuiltBotTough
+Bullseye
+CATExplorador
 CazoodleBot
+CCBot
+Cegbfeieh
 CensysInspect
+check1.exe
 CherryPicker
-CheTeam
-Chlooe
 Claritybot
 Cloud mapping
-coccocbot-web
-CODE87
-cognitiveseo
+Cocolyzebot
+com.plumanalytics
 CopyRightCheck
-Copyscape
-Craftbot
-crawler4j
-crawler.feedback
+Cosmos
 crawl.sogou.com
+CrazyWebCrawler
 CrunchBot
-CSHttp
-Curious
 Custo
 DatabaseDriverMysqli
 DataCha0s
-demandbase-bot
-Deusu
-DIIbot
-Dispatch
-DomainAppender
-DomainStatsBot
-DomCopBot
-DSearch
+DigitalPebble
+Discobot
+Discoverybot
+DnyzBot
+domainsproject.org
+Dotbot
 Ebingbong
-EroCrawler
-Evil
-Flunky
-Foobot
-Freeuploader
+ECCP/1.0
+EirGrabber
+EMail Siphon
+EMail Wolf
+evc-batch
+ExtLinksBot
+Extreme Picture Finder
+EyeNetIE
+Ezooms
+facebookscraper
+FemtosearchBot
+FlashGet
 FrontPage
 Fuzz
+Fyrebot
 GalaxyBot
-Genieo
-Getintent
+GermCrawler
 Gigabot
-Go-Ahead-Got-It
-gopher
+Gotit
 GoZilla
+Go!Zilla
 Grabber
-GrabNet
 GrapeshotCrawler
-GT::WWW
 Haansoft
+HaosouSpider
 heritrix
-Heritrix
-Hloader
-IDBot
+HTTP::Lite
+HTTrack
+Humanlinks
+HybridBot
+IDBTE4M
 Id-search
 Image Sucker
+IndeedBot
 InfoNaviRobot
 InfoTekies
-InterGET
-Iria
-IRLbot
-isitwp.com
-Iskanie
-JamesBOT
+Intelliseek
+Internet Ninja
+InternetSeer
+internetVista monitor
+ips-agent
+Jbrofuzz
 JennyBot
-Joomla
-Jorgee
+JustView
+Kenjin Spider
 Keyword Density
-Larbin
-LeechGet
-Lftp
-Likse
-Linkbot
-LinkextractorPro
-LinkScan
-LinqiaRSSBot
-Lipperhey
-Lipperhey Spider
-Litemage_walker
-Ltx71
-lwp-request
-LWP::Simple
-Magnet
+Kozmosbot
+Lanshanbot
+Lightspeedsystems
+LinksManager
+LinqiaMetadataDownloaderBot
+LinqiaScrapeBot
+Lmspider
+LNSpiderguy
+Mag-Net
 magpie-crawler
+Majestic12
 Majestic SEO
 MarkMonitor
-MarkWatch
-Masscan
-Mass Downloader
-Mata Hari
-Meanpathbot
+MauiBot
 Mediatoolkitbot
 mediawords
-MegaIndex.ru
-Metauri
+MicroMessenger
+Microsoft Data Access
+MIDown tool
+MIIxpc
 Moblie Safari
-Mojeek
-Mojolicious
-Morfeus Fucking Scanner
-Mozlila
-Musobot
+MSIECrawler
+Msrabot
 Name Intelligence
-Nameprotect
-NearSite
-Nessus
-Netcraft
+Navroad
 netEstate NE Crawler
-NetSpider
-Net Vampire
-NextGenSearchBot
+NetLyzer
+Nettrack
+Netvibes
+Nibbler
 Niki-bot
-NimbleCrawler
-Octopus
-OnCrawl
+Ninja
+NPbot
+oBot
+Offline Explorer
+Offline Navigator
 OpenLinkProfiler
-OPPO A33
-PageGrabber
-PageScorer
-PageThing.com
-Panscient
-pcBrowser
-PECL::HTTP
-PeoplePal
+OpenVAS
+OutfoxBot
+page scorer
 Petalbot
-Picsearch
-PictureFinder
-Piepmatz
+Pimonster
 Pi-Monster
 Pixray
-POE-Component-Client-HTTP
-ProPowerBot
-ProWebWalker
-Psbot
-Pu_iN
+PleaseCrawl
+Pockey
+probe-image-size
+Pump
 PxBroker
+PyCurl
+RankActive
 RankFlex
-Rankivabot
-Ripper
-ripz
-RocketCrawler
+RebelMouse
+Recorder
+RepoMonkey
 RSSingBot
+SalesIntelligent
 satoristudio.net
+ScanAlert
 Scrapy
-ScreenerBot
+ScrepyBot
 SearchmetricsBot
 SemrushBot
 SentiBot
 seobility
-SeobilityBot
-SeoSiteCheckup
-SEOstats
+SEOlyticsCrawler
+Seomoz
+seoscanners
 sexsearcher
 Shodan
-SiteCheckerBotCrawler
-Siteimprove
+Sitebeam
 SiteLockSpider
-SiteSnagger
-SiteSucker
-Site Sucker
+SlySearch
+SMTBot
+Snake
 Snoopy
 Sosospider
-Sottopop
-SpaceBison
-SpankBot
+Spammen
 Spanner
+sp_auditbot
 Spbot
-Spinn3r
-spyfu
-Sqworm
-Steeler
+Sucuri
+SuperHTTP
 Surfbot
-SurveyBot
-Suzuran
-Swiftbot
+sysscan
 Szukacz
 T0PHackTeam
-T8Abot
-tAkeOut
-TeleportPro
-Telesoft
+Teleport
 Telesphoreo
 The Intraformant
-TheNomad
 TightTwatBot
+Titan
 Toata
+Toweyabot
+Tracemyfile
 Trendiction
+Trendictionbot
 trendiction.de
-Turingos
-VCI
+Turnitin
+TurnitinBot
+Typhoeus
+Upflow
+URLy.Warning
+Vacuum
+Vagabondo
+V-BOT
+VB Project
+VelenPublicWebCrawler
 VeriCiteCrawler
+VidibleScraper
 Virusdie
 Voltron
-Webalta
-WebAuto
-Web Auto
+Wallpapers/3.0
+WallpapersHD
 WebBandit
-Web Collage
-WEBDAV
-Web Enhancer
-Web Fetch
+WebCollage
+WebCopier
+WebFetch
 WebFuck
 Web Fuck
-WebImageCollector
+WebGo IS
 WebLeacher
+webmeup-crawler
+WebPix
 Web Pix
 WebReaper
 Web Sauger
-Webshag
-WebsiteExtractor
-Webster
 WebWhacker
 WeSEE
+Whack
+Whacker
 Whatweb
-Widow
 WinHTTrack
-WiseGuys Robot
+Wonderbot
+Woobot
+Wotbox
+Wprecon
 WWW-Collector-E
 WWW::Mechanize
+x09Mozilla
 x22Mozilla
-Xaldon_WebSpider
-YoudaoBot
+Xenu
 Zade
 zauba.io
 Zermelo
-ZoominfoBot
-ZyBorg
+ZmEu
+ZoomBot
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 31fbe3ccd..2a74934bd 100644
--- a/.dev-tools/test_units/random-bots-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-bots-for-whitelist-test.list
@@ -1,250 +1,250 @@
-404checker
-404enemy
+360Spider
 80legs
-Aboundexbot
-ADmantX
-AhrefsBot
+Aboundex
+AfD-Verbotsverfahren
 AiHitBot
 Alexibot
-AllSubmitter
 AlphaBot
-Ankit
-Apexoo
-archive.org_bot
-Aspiegel
-ASPSeek
-autoemailspider
-AwarioRssBot
 AwarioSmartBot
-backlink-check
 BacklinkCrawler
-BackStreet
-BDCbot
+BackWeb
+Badass
+Battleztar Bazinga
+BetaBot
+Bigfoot
 Bitacle
-Black Hole
-BlackWidow
-BLEXBot
-BotALot
-Brandwatch
-Buck
+Blow
 Bullseye
-BunnySlippers
 BuzzSumo
+Calculon
+CATExplorador
 CazoodleBot
+Cegbfeieh
 CensysInspect
 check1.exe
-CherryPicker
-CheTeam
-ChinaClaw
 Chlooe
 Cloud mapping
-coccocbot-web
-Cocolyzebot
-CODE87
 cognitiveseo
-Collector
 com.plumanalytics
 CopyRightCheck
-Cosmos
 Craftbot
-crawler4j
+crawler.feedback
+crawl.sogou.com
+CrazyWebCrawler
 CrunchBot
+CSHttp
+Custo
 CyotekWebCopy
 DatabaseDriverMysqli
 DBLBot
+demandbase-bot
+Deusu
 Digincore
 DigitalPebble
-DIIbot
+Dirbuster
+Disco
+Discobot
 Dispatch
-DomainStatsBot
-Dotbot
-Drip
-DSearch
-EasyDL
-EMail Siphon
-evc-batch
+DnyzBot
+DomainCrawler
+DomainSigmaCrawler
+Domains Project
+Dragonfly
+Ebingbong
+ECCP/1.0
+EirGrabber
 Exabot
 ExtLinksBot
-EyeNetIE
-Ezooms
+Extractor
+ExtractorPro
+Extreme Picture Finder
+FDM
+FemtosearchBot
 FHscan
 Fimap
-Foobot
-FyberSpider
 Fyrebot
-GalaxyBot
 Genieo
-G-i-g-a-b-o-t
-Go-Ahead-Got-It
+GetWeb
 Gotit
 GoZilla
-Grafula
-GrapeshotCrawler
-HaosouSpider
+Grabber
+GrabNet
+GridBot
+Haansoft
 Havij
-HEADMasterSEO
 heritrix
-Heritrix
-Hloader
-HTTP::Lite
-Humanlinks
-HybridBot
-IlseBot
-Image Fetch
+HTMLparser
+Iblog
+IDBTE4M
+Id-search
 Image Sucker
+Indy Library
 InfoTekies
 instabid
-InternetSeer
+Intelliseek
 internetVista monitor
+IRLbot
+IstellaBot
+JamesBOT
+Jbrofuzz
 JennyBot
-JOC Web Spider
-Joomla
-JustView
+Jetty
+JikeSpider
 Jyxobot
 Kenjin Spider
-Kozmosbot
+Keyword Density
+Kinza
 Larbin
-LeechGet
-Libwhisker
-LinkpadBot
+LeechFTP
+LieBaoFast
+Linkbot
+Linkdexbot
 LinkScan
-LinqiaMetadataDownloaderBot
-LinqiaScrapeBot
+LinksManager
+LinkWalker
+LinqiaRSSBot
 Lipperhey
 Lipperhey Spider
-Lmspider
-lwp-trivial
-Majestic-SEO
+Litemage_walker
+magpie-crawler
 MarkMonitor
-Meanpathbot
-Mediatoolkitbot
+Masscan
+Mass Downloader
+Mata Hari
+Mb2345Browser
+mediawords
+MegaIndex.ru
+Metauri
 MicroMessenger
-Microsoft URL Control
-MIDown tool
+Microsoft Data Access
+MIIxpc
+Mister PiX
+MJ12bot
+Moblie Safari
+Morfeus Fucking Scanner
+Mozlila
 MQQBrowser
-Mr.4x3
 MSFrontPage
-MSIECrawler
+Msrabot
 muhstik-scan
-Name Intelligence
-Nessus
-Netcraft
+Musobot
+netEstate NE Crawler
 NetMechanic
-NextGenSearchBot
-Nikto
+NetSpider
+Nettrack
+Netvibes
+Ninja
+NPbot
 oBot
-Offline Navigator
-Openfind
-PageAnalyzer
-PageGrabber
-page scorer
-Papa Foto
+Offline Explorer
+OnCrawl
+OrangeSpider
+Page Analyzer
+Panscient
 Petalbot
+PHPCrawl
+Picscout
 Picsearch
 Piepmatz
-Pimonster
 Pi-Monster
-Pixray
-PleaseCrawl
+plumanalytics
 Pockey
-probe-image-size
-ProPowerBot
-ProWebWalker
+POE-Component-Client-HTTP
+polaris version
 Psbot
 Pu_iN
-PyCurl
+PxBroker
+Quick-Crawler
 RankActive
-RankFlex
+RankActiveLinkBot
 RankingBot
-RealDownload
-ReGet
+RankurBot
+Reaper
+RedesScrapy
 RepoMonkey
-Ripper
-ripz
+Re-re
 RocketCrawler
-scan.lol
-Scrapy
-ScreenerBot
-ScrepyBot
-SearchmetricsBot
+Rogerbot
+satoristudio.net
+ScanAlert
+Scanbot
+ScoutJet
 Semrush
-SemrushBot
 SeobilityBot
+SEOkicks-Robot
 Seomoz
 SEOprofiler
+seoscanners
+SeoSiteCheckup
 seostar
-sexsearcher
 Shodan
-Siphon
 SISTRIX
-Sitebeam
+sitechecker.pro
 SiteExplorer
-siteripz
 SiteSucker
-SMTBot
+Site Sucker
+Sitevigil
+Snapbot
 Snoopy
-Sociscraper
-sogouspider
-Sottopop
+SpaceBison
 Spammen
+SpankBot
 sp_auditbot
+Spinn3r
 spyfu
-Sqlmap
 Stripper
 Sucker
 Sucuri
-SuperHTTP
-Surfbot
-SurveyBot
-Suzuran
 Swiftbot
-Szukacz
+tAkeOut
 TeleportPro
-Telesphoreo
-Telesphorep
 The Intraformant
-Thumbor
+TheNomad
+Titan
+Toata
+Tracemyfile
 Trendiction
-trendiction.com
 trendiction.de
-Turingos
 TwengaBot
-Typhoeus
+UnisterBot
 Upflow
-V-BOT
+URLy.Warning
+Vacuum
+Vagabondo
+VB Project
 VCI
-VidibleScraper
+VeriCiteCrawler
 Virusdie
-voyagerx.com
-WallpapersHD
+WASALive-Bot
 Webalta
-WebAuto
-Web Auto
-WebCollage
-WebEnhancer
-Web Enhancer
+Web Collage
 WebFetch
-Web Fetch
+WebFuck
 Web Fuck
-WebImageCollector
-webmeup-crawler
-WebReaper
+WebLeacher
+Web Pix
 WebSauger
 Web Sauger
-WebsiteQuester
+WebsiteExtractor
+Website Quester
+WebStripper
+Web Sucker
 WebWhacker
+WebZIP
+WeSEE
 Whack
-Whacker
-Who.is Bot
-WinHTTrack
+Whatweb
 WiseGuys Robot
-WISENutbot
-Wprecon
+Woobot
+Wotbox
 WWW-Mechanize
-WWWOFFLE
+WWW::Mechanize
+x09Mozilla
+x22Mozilla
 Xaldon WebSpider
-Xenu
-YoudaoBot
 Zauba
-Zitebot
-ZumBot
+zauba.io
+Zeus
+ZmEu
+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 c1e47aa3a..2cde22d6f 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 @@
-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
+djstools.com
+ie.57883.net
+lacapilla.info
+obiavo.net
+porndroids.com
+pornodojd.ru
+putevka24.ru
+rubbed.us
+scenicmissouri.us
+screpy.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 0f822e098..002f72603 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 @@
-01apple.com
-03e.info
-0lovespells0.blogspot.com
-101flag.ru
-1688.com
-1adult.com
-1millionusd.xyz
-3rbseyes.com
-3w24.com
-4ureyesonly.com
+0c47f8422d3f.com
+21h2o.com
+256bit.by
+2ads.co.uk
+2rich4bitches.com
+40cg.com
+4inn.ru
+4webmasters.org
+55wmz.ru
+5i2.net
+70casino.online
 7a2rnuey1tw9ar.ru
-7zap.com
-8si.ru
-999webdesign.com
-abclauncher.com
-abovetherivernc.com
+aac52006ec82a24e08b665f4db2b5013f7.com
+abcdeg.xyz
 academiacsmendoza.org
-acheterviagrafr24.com
-acortarurl.es
-adconscious.com
-adserver-e7.com
-ageofclones.com
-agreda.pluto.ro
-aksonural.ru
-aktobe.xkaz.org
-alessandraleone.com
-all4invest.ru
-allcredits.su
-allpdfmags.net
-alltheviews.com
+acads.net
+accessoires-mode.in
+addray.pro
+adelly.bg
+adimmix.com
+adservme.com
+adultwebhosting.info
+adzerg.com
+aghanyna.com
+akvamaster.dp.ua
+alert-fjg.xyz
+aliexpress.com
+alkoravto.ru
 alpharma.net
-am15.net
-amehdaily.com
-apple.com-cleaner.systems
-apple.com-webbrowsing-security.review
-app-ready.xyz
-appsecurityr.com
-aruplighting.com
-asrv-a.akamaihd.net
-asseenontv.ru
-autodo.info
-autovideobroadcast.com
-autowebmarket.com.ua
-avek.ru
-aviav.eu
+amateurgalls.com
+amoi.tn
+analnoeporno.tv
+an-donut.com
+angigreene.com
+angry-fermi-7633.arukascloud.io
+anniemation.com
+anonymous-redirect.com
+anticrawler.org
+apccargo.com
+apimegabrowsebiz-a.akamaihd.net
+apioutoboxnet-a.akamaihd.net
+a.pr-cy.ru
+astrochicks.com
+atmovs.com
+atovh.local-finders.com
+autobrennero.it
+autogrep.ru
+autonew.biz
+autorn.ru
+avirasecureserver.com
 aviva-limoux.com
-avtochehli.by
+avtolombard-krasnodar.com
 awency.com
-azbukadiets.ru
-backlink4u.net
-bag77.ru
-bagsonsale.online
-bavsac.com
-bedcapdealers.com
-belinvestdom.by
-best-games.today
-bestsexyblog.com
-best-way.men
+babosas.com
+backlinkwatch.com
+backuperwebcam.weebly.com
+baksman.com
+bala.getenjoyment.net
+balkanfarma.ru
+bambi.ck.ua
+bankofthewext.com
+bannerbank.ru
+barbourjackets.online
+bayareaaeroclub.org
+belstaffstore.online
+bensbargains.net
+berdasovivan.ru
+beremenyashka.com
+bestpriceninja.com
+betterhdporn.com
+bg6s0.com
 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
-cheapbarbour.online
-cheapcigarettesc.info
-cheapestjerseysonwholesale.com
-cheapmoncler.pw
-cheatcode-lita12.rhcloud.com
-checkm8.com
-cherubinimobili.it
-cialisndbrx.com
-cityadspix.com
-cleanpcnow.com
-clickpapa.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
+bidbuy.co.kr
+biteg.xyz
+blackcurranthumidifiers.site
+blockworld.ru
+blogporn.in
+blog.remote-computer.de
+blogs.rediff.com
+blue-square.biz
+bobba.dzaba.com
+bonvillan.com
+bonzbuddy.com
+brokergid.ru
+btc4u.ru
+bumble.cheapwebsitehoster.com
+bupropion-sr-150-mg.us
+burkesales.com
+buypillsorderonline.com
+calstaterealty.us
+candlehandmade.com
+candy-glam-hp.com
+carabela.com.do
+carfax.com.ua
+carloans.com
+carmuffler.net
+carsdined.org
+carson.getenjoyment.net
+cartierreplica.xyz
+cbozhe.com
+cezartabac.ro
+chastnoeporno.com
+cheapmarmot.online
+cheap-pills-norx.com
+chocolateslim-u-srbiji.com
+choosecuisine.com
+christianlouboutinsaleoutletonline.us
+citetick.com
+citysecurity.nu
+clickbank.net
+clicksotrk.com
+clodo.ru
+compliance-barak.top
+compliance-checker.info
+com-supportcenter.website
+concealthyself.com
+concordexoticrentals.com
+copenergo.ru
+counciltally.com
+creditwell.ru
+cscwtalkto.site
+custodieva.ru
+customsua.com.ua
+dandiyabeats.in
+delfin-aqua.com.ua
+delitime.info
+deutschland123.de
+dfiles.me
+diarioaconcagua.com
+digest-project.ru
+dikqlyremy.info
+dikx.gdn
 discountbarbour.online
-dmmspy.com
-doeco.ru
-dollartree.info
-domainsatcost.com
-dominateforex.ml
-domination.ml
-domini.cat
-downloaddy.net
-dscaas.website
-dumpsmania24.com
-earncash.com.ua
-ebonyporn.site
-educontest.net
-ekn-art.se
-elektrozigaretten2.yn.lt
-elmacho.xyz
-emailaccountlogin.co
-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
-fetlifeblog.com
-filesclub.net
-filesvine.com
-filmidivx.com
-financepoints.eu
-finuse.com
-flirt4free.com
-floridamobilebillboards.com
-food.dtu.dk
-forodvd.com
-forum69.info
-foto-weinberger.at
-frankofficial.ru
+domznaniy.ru
+dpihatinh.gov.vn
+eandsgallery.com
+earthmagic.info
+easycommerce.cf
+elektir.ru
+elektrischeziga.livejournal.com
+elektroniksigaraankara.info
+elektrozigarettekaufen1.devhub.com
+elkacentr.ru
+eluxer.net
+elvel.com.ua
+en.altezza.travel
+enge-fotzen.info
+englishdictionaryfree.com
+erotik-kostenlos.net
+ertelecom.ru
+escortplius.com
+escortslet.net
+estelight.ru
+estibot.com
+europeanwatches.ru
+exdocsfiles.com
+extractorandburner.com
+ezaz.info
+ezofest.sk
+f5mtrack.com
+faptitans.com
+farmprofi.net
+fetishinside.com
+filmi-onlain.info
+floridahuntingfishingadventures.com
+forex21.ru
+formseo.com
+formulaf1results.blogspot.com
+forum20.smailik.org
+fotopop.club
+fotoxxxru.com
 freecamdollars.com
-free-fbook-traffic.com
-free-share-buttons.com
-freesitetest.com
-fuckmill.com
-fxund.us
-g7m.pl
-galaxy-family.ru
+freegamesplay.online
+free-gluten.ru
+freelifetimefuckbook.com
+freetangodownload.com
+fuck-paid-share-buttons.xyz
 galeon.com
-gallictures.com
-gamerscorps.com
-gateway.zscalerone.net
-gavuer.ru
+gambarxkata.co
+gamebackyard.com
 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
+gk170.ru
+gne8.com
+goldandcard.ru
+goodprotein.ru
+goroda-vsego-mira.ru
+graphid.com
+growshop.es
+grupografico-pilar.com.ar
+h2monline.com
+hanink.biz.ly
+hard-porn.mobi
 hazardky.net
-hdxnxxtube.mobi
-hifidesign.ru
-hildinghr.se
-histats.com
-hkladys.com
-hledejvshopech.cz
-holidaypics.org
-homedecorpicture.us
-homegardenlova.com
+hdwallpapers-free.com
+headpharmacy.com
+heartofbeijing.blogspot.com
+hermesreplica.pw
+highspeed5.net
+host-protection.com
+host-tracker.com
+hotdl.in
 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
-keenoutlet.online
-kemerovo.zrus.org
-kiinomaniak.pl
-kinobest.pl
-kinohall.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
+humanelydrew.com
+idegenvezeto.eu
+ideibiznesa2015.ru
+ido3.com
+iloveitaly.ru
+images-graphics-pics.com
+imguramx.pw
+imperia31.ru
+impisr.edunsk.ru
+indetiske.ya.ru
+indianmedicaltourismshop.com
+inmate-locator.us
+integritylandscapeservices.com
+intellekt21.ru
+interferencer.ru
+interfucks.net
+intermesh.net
+iopeninghours.co.uk
+isitpaleo.info
+ispaniya-costa-blanca.ru
+itservicesthatworkforyou.com
+ixora.pro
+izhevsk.zrus.org
+janavibekken.no
+jetsli.de
+jumptap.com
+jurajskie.info
+jus0wil.pp.ua
+kamen-e.ru
+kandidos.com
+kazan.xrus.org
+keywordhut.com
+keywordteam.net
+kinopolet.net
+klumba55.ru
+knigonosha.net
+kometars.xyz
+komp-pomosch.ru
+konpax.com
+kreativperlen.ch
+kurbappeal.info
+lacave.ntic.fr
+law-check-eight.xyz
+laxdrills.com
+lazymanyoga.com
+leadn.pl
+leftofcentrist.com
+lesbian.xyz
+letslowbefast.site
 life.biz.ua
+lifebyleese.com
+lignofix.ua
 likrot.com
 linerdrilling.com
-link.ac
-liquimondo.com
-liveinternet.ru
-lovelycraftyhome.com
-lunchrock.co
+linkrr.com
+lion.misba.us
+liran-locks.com
+littlesexdolls.com
+liver-chintai.org
+liverpool.gsofootball.com
+loadopia.com
+localflirtbuddies.com
+lombia.co
+lookingglassemb.com
+louboutinshoes.xyz
+luchshie-topcasino.ru
 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
-mrlmedia.net
-mulberryoutletonlineeu.com
-music.utrolive.ru
-my-bc.ru
+macdamaged.tech
+mackeeper-center.club
+makenahartlin.com
+marcowebonyodziezowe.pl
+mcadamssupplyco.com
+meget.co.za
+meltwater.com
+menetie.ru
+mobilierland.com
+moneyteam24.com
+mostantikor.ru
+mozello.ru
+mp3ritm.top
+mrinsidesales.com
+muschisexbilder.com
+mxgetcode.com
+mycaf.it
+mycouponizemac.com
+myfreecams.com
 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
+mzdish.site
+najaden.no
+narutonaruto.ru
+netfacet.net
+net-profits.xyz
+net-radar.com
+nfvsz.com
+nlfjjunb5.ru
 npoet.ru
-obsessionphrases.com
-oksrv.com
-online247.ml
-onlineserialy.ru
-oralsexfilme.net
+nudejapan.net
+obiavo.net
+office2web.com
+oil-td.ru
+okroshki.ru
+o.light.d0t.ru
+olympescort.com
+onefilms.net
+onlinemeetingnow.com
+online-podarki.com
+open-odyssey.org
 osoznanie-narkotikam.net
-ostrovtaxi.ru
+ourtherapy.ru
 owohho.com
-paceform.com
-page2rss.com
-pammik.ru
-panchro.co.uk
-paradontozanet.ru
-paramountmarble.co.uk
-partner-pop.men
-partnersafe.men
-parvezmia.xyz
-paydayloanslocal.com
-pc-test.net
-piccshare.com
-picphotos.net
-pics-group.com
-pills24h.com
-pipki.r.acdnpro.com
-pivka.xyz
-pixelrz.com
-plastgranar.nu
-pliks.pl
-pod-muzyku.club
-pokemongooo.ml
-polytopesexempt.com
-popander.mobi
-poptool.net
+panicatack.com
+panouri-solare-acoperis.com
+parajumpersjakkesalgnorge.info
+partner-high.men
+pastaleads.com
+pdn-4.com
+pdns.cz
+pekori.to
+penisvergrotendepillennl.ovh
+perso.wanadoo.es
+petsblogroll.com
+photostudiolightings.com
+physfunc.ru
+pijoto.net
+pixgood.com
+pizza-tycoon.com
+pogodnyyeavarii.gq
+poiskzakona.ru
+pons-presse.com
+popcash.net
+popserve.adscpm.net
+pornoblood.com
+pornobrazzers.biz
+pornoklad.ru
 pornolook.net
-pr0fit-b0x.com
-presleycollectibles.com
-prizefestival.mobi
-professionaldieselcare.com
-promgirldresses.xyz
-promodj.com
-propranolol40mg.blogspot.com
-prostitutki-tolyatti.org
-proxyradar.com
-psa48.ru
-pshare.biz
-psvita.ru
+pornoslive.net
+poshiv-chehol.ru
+powenlite24.ru
+prefersurvey.net
+profit-opportunity.com
+prostitutki-astana.org
+prostitutki-kharkova.org
+pufip.com
+purplesphere.in
 purplestats.com
-pushdata.sendpulse.com
-puteshestvennik.com
+pxhdwsm.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
-sady-urala.ru
-safe-app.net
-sawin.beth.webd.pl
+qwarckoine.com
+qwesa.ru
+realresultslist.com
+reckonstat.info
+registratciya-v-moskve.ru
+registry-clean-up.net
+relatodelpresente.com.ar
+rennlist.com
+reward-survey.net
+rniaeba.ga
+rockingclicks.com
+rockprogblog.com
+ros-ctm.ru
+rospromtest.ru
+rusprostitute.com
+russia-tao.ru
+sabaapress.com
+samolet.fr
+sampleletters.net
+saugatuck.com
 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
-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
-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
+sbprabooks.com
+scansafe.net
+sdi-pme.com
+searchimpression.com
+searchmywindow-a.akamaihd.net
+securityallianceservices.com
+seeresultshub-a.akamaihd.net
+sel-hoz.com
+seofirmreviewsus.info
+serdcenebolit.com
+servingnotice.com
+sex-dating.co
+sexvideo-sex.com
+sharpchallenge.com
+shoplvlv.us
+shopperifymac.com
+shopwme.ru
+silvermature.net
+similardeals.net
+simple-share-buttons.com
+sim-service.net
+siteaero.com
+sitebeam.net
+sladkoevideo.com
+slowmac.tech
+snsdeainavi.info
+socas.pluto.ro
+social-button.xyz
+social-fun.ru
+socialmediasuggest.com
+sockshare.net
+soft-program.com
+solicita.info
+sotkal.lark.ru
 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
+special-porn.com
+spinnerco.ca
+srdrvp.com
+stanthonyscatholicchurch.org
+stard.shop
+sterva.cc
+stretchingabuckblog.com
+studentguide.ru
+studworks.org
+superiends.org
+supermama.top
+swinon.site
+tacbibirfa.tk
+tanieaukcje.com.pl
+t-bygg.com
+tds-advert002.info
+thecoolimages.net
+theguardlan.com
+tiens2010.ru
+timer4web.com
 tizanidine4mguses.blogspot.com
-tizanidineandcipro.blogspot.com
-tizanidineshowupondrugtest.blogspot.com
-tizanidinestreetvalue.blogspot.com
-tizanidinevssoma.blogspot.com
+tizanidineinteractions.blogspot.com
+tizanidineoral.blogspot.com
+tizanidinerestlesslegsyndrome.blogspot.com
+tizanidinesideeffectsweightloss.blogspot.com
+tizanidinevscyclobenzaprine.blogspot.com
+tizanidinevsvalium.blogspot.com
 tjkckpytpnje.com
-tonivedu.it
-top10-way.com
-topvidos.ru
-totu.info
-tube8.com
-tula.howotorg.ru
-typimga.pw
-ukrtvory.in.ua
-umnovocaminho.com
-unlimitdocs.net
+tomck.com
+top1-seo-service.com
+tourismvictoria.com
+toxicwap.com
+trafficgenius.xyz
+trafficmania.com
+trainoffend.ml
+tripper.de
+try-rx.com
+turizmus.us
+udayavani.com
+uggsale.online
+ukkala.xyz
 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
+url-img.link
+uroki.net
+vasileostrovsky-rayon.ru
+vezuviy.su
+viagra.pp.ua
+videogamesecrets.com
+video-production.com
+vinylvault.co.uk
+visitcambridge.org
+vitanail.ru
+viteonlusarezzo.it
 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
-youjizz.com
-youthreaders.com
-youtoner.it
-yuarra.pluto.ro
+vremya.eu
+warning.or.kr
+weblo.com
+webscouter.net
+website-stealer.nufaq.com
+websitevaluebot.com
+whatzmyip.net
+wheelchairliftsarea.com
+wholesalenfljerseys.us.com
+wnoz.de
+xcombear.ru
+xingzi-vision.com
+xn-----6kccaibs5cb8afhjrfmix2n.xn--p1ai
+xn--80aaajbdbddwj2alwjieei2afr3v.xn--p1ai
+xn--80aodinpgi.xn--p1ai
+xn----9sbubg3ambdfl1j.xn--p1ai
+xn--b1addnj3cah.xn--p1ai
+xn--l1aengat.xn--p1ai
+xsion.net
+xtrafficplus.com
+xxxguitars.com
+xzlive.com
+yatrk.xyz
+yellowstonevisitortours.com
+yginekologa.com
+youandcredit.ru
+youjizz.vc
+yourads.website
+ypmuseum.ru
+yur-p.ru
 zajm-zalog-krasnodar.ru
-zapatosenventa.info
-zarenica.net
-zeikopay.com
-zeleznobeton.ru
-zoomovies.org
-zoosexart.com
-zx6.ru
-zytpirwai.net
+zakazfutbolki.com
+zakazvzloma.com
+zeroredirect10.com
+zeroredirect1.com
+z-master.ru
+znakom.sibtest.ru
+zocaparj.kz
+zs2vm.top
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 2a668f6bb..b7f0a67b0 100644
--- a/.dev-tools/test_units/random-referrers-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
@@ -1,250 +1,250 @@
-03p.info
-1008.su
-101billion.com
-1-free-share-buttons.com
-1kinobig.ru
+214jaluwobapef.cf
+2345.com
 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
-ardimobileinfo.ml
-arenanews.com.ua
-artel116.ru
-asscenihotosidea.blogspot.co.za
-aversis.net
-azartniy-bonus.com
-azbuka-mo.ru
-betterscooter.com
-bfz.biz
-bin-brokers.com
-bioca.org
-bjanshee.ru
-blog.koreadaily.com
-bonzybuddy.com
-brendbutik.ru
-cakemediahq.com.au
-cakesplus.com.au
-carmuffler.net
-cartierwatch.xyz
-cartujano-pre.de
-cdncash.com
-cfjump.com
-cfsrating.sonicwall.com
-chatroulette.video
-cheatcode-lita12.rhcloud.com
-cialischstgerts.com
-ciekawinki.pl
+404.mn
+8si.ru
+academiacsmendoza.org
+adhome.biz
+adimmix.com
+adinterax.com
+adloads.com
+adtology.com
+advertex.info
+affordablewebsitesandmobileapps.com
+affrh2015.com
+aihelen.net
+aimayangzhi.com
+akita.kz
+alborzan.com
+alienwheel.es
+alif-ba-ta.com
+all4wap.ru
+apartment.ru
+apibatbrowsecom-a.akamaihd.net
+appiq.mobi
+artparquet.ru
+artpicso.com
+arvut.org
+atlasvkusov.ru
+autoseo-traffic.com
+aviav.ru
+azartclub.org
+azinoofficial777.ru
+back.dog
+bestimagecoollibrary.com
+bibys.com
+bio-market.kz
+bio-optomarket.ru
+birzha-truda.eu
+biznesluxe.ru
+bizru.info
+blogsfunky672.weebly.com
+bmw.afora.ru
+brewdom.ru
+brillianty.info
+brimstonehillfortress.org
+budpost.com.ua
+buyviagraa.blogspot.com
+bvlgariring.xyz
+byme.se
+cacheimages.com
+calvet.altervista.org
+canrioloadm.gq
+cartierbracelet.xyz
+cbox.ws
+cdncash.org
+ceotrk.com
+cheapmoncler.pw
+cigarpass.com
+cinemaenergy-hd.ru
 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
-everytalk.tv
-ezigarettekaufen1.hpage.com
-ezigarettekaufen2.blox.pl
-ezigarettekaufen2.yolasite.com
-failingmarriege.blogspot.com
+cmhomestayagency.com
+com-secure.download
+coop-gamers.ru
+cxpromote.com
+depositfiles-porn.ga
+derevesendeco.com
+discovertreasure-a.akamaihd.net
+docstoc.com
+dostavimvdom.ru
+eachdayisagift.review
+educatemetv.com
+edudocs.net
+elektrozigarettekaufen2.blogse.nl
+elkacentr.ru
+englishdictionaryfree.com
+eorogo.top
 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
-humanorightswatch.org
-ihtec2019.org
-incanto.in.ua
-intellego.info
-iopeninghours.co.uk
-irkutsk.zrus.org
-ixora.pro
-javlibrary.cc
-jestr.org
+fashion.stellaconstance.co
+favornews.com
+fertilitetsradgivningen.se
+fetroshok.ru
+fickblock18.com
+filerockstar298.weebly.com
+filesdatabase.net
+financepoints.eu
+find1friend.com
+fireads.men
+flashahead.info
+forexgb.ru
+forex-procto.ru
+fortunejack.com
+fotosfotos.eu
+franch.info
+free-fb-traffic.com
+free-today.com
+fuck-paid-share-buttons.xyz
+gaming-journal.com
+gcup.ru
+glopages.ru
+gobongo.info
+golfresa.lucania.se
+gotcher.us
+gotomontenegro.net
+gwebtools.com.br
+hayate.biz
+hildinghr.se
+hotdl.in
+housemilan.ru
+icaseclub.ru
+insider.pro
+insurple.com
+interior-stickers.ru
+i-service.kz
 jofucipiku.tk
-jovencitas.gratis
-jwcialislrt.com
-kam-dom.ru
+johnrobertsoninc.com
+karachev-city.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
-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
-pizdeishn.com
-pl.id-forex.com
-pokemon-go-play.online
-porndairy.in
-pornoklad.net
+kazan.zrus.org
+kazrent.com
+kino-rating.ru
+lasvegaslockandsafe.com
+law-check-nine.xyz
+lazy-z.com
+leadn.pl
+locationdesaison.com
+lockerz.com
+lodki-pvh.dp.ua
+lonfon.xyz
+luxmagazine.cf
+magazintiande.ru
+makis.nu
+masterseek.com
+meendo-free-traffic.ga
+mega-bony-2017.pl
+midst.eu
+mindeyegames.com
+minet.club
+misandesign.se
+most.gov.iq
+mulberryoutletonlineeu.com
+myfreetutorials.com
+mypornfree.ru
+narutonaruto.ru
+noclegonline.info
+nzfilecloud.weebly.com
+okuos.com
+onlinemegax.com
+panchro.xyz
+papasdelivery.ru
+peekyou.com
+pelfind.me
+pinapchik.com
+pisanieprac.info
+pornogig.com
 pornoklad.ru
-pornoted.com
-pravoholding.ru
-preconnubial.usuby.site
-professionaldieselcare.com
+preparevideosafesystem4unow.site
 profit-opportunity.com
-quickchange.cc
-quickloanbank.com
-rapidokbrain.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
+prombudpostach.com.ua
+py100.ru
+rabotaetvse.ru
+ranksays.com
+realnye-otzyvy.info
+responsive-test.net
+roofers.org.uk
+ruex.org.ua
+runofilms.ru
+rusenvironmental.net
+rusexy.xyz
+ruspdd.com
+rvi.biz
+saletool.ru
+saneitconsulting.com
+sbdl.no
+scanner-don.top
+scanner-ivan.top
+scanner-jessica.top
+screpy.com
 sdelai-prosto.ru
-securesmrt-dt.com
-sel-hoz.com
-semp.net
-senger.atspace.co.uk
-seofirmreviewsus.info
-seorank.info
-sextracker.be
-shtaketniki.ru
-siha.de
-smallseotools.com
-snyatie-lomki-v-stacionare.ru
-socialbuttons.xyz
-social-fun.ru
-socialmonkee.com
-softonicads.com
-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
+search.pch.com
+see-your-website-here.com
+selectads.men
+seoanalyses.com
+sex-dating.co
+sexobzor.info
+sexy-pings.com
+shop-electron.ru
+simplepooltips.com
+sitechecker.pro
+skincrate.net
+snip.to
+snow.nvr163.com
+snts.shell-pmr.ru
+socialmadesimple.com
+sockshare.net
+spammen.de
+specialfinanceoffers.com
+squidoo.com
+stroiminsk.com
+supermodni.com.ua
+susanholtphotography.com
+svnuppsalaorebro.se
+swinger-mobil.net
+swinon.site
+tam-gde-more.ru
+technika-remont.ru
+thefarmergame.com
+thegalerie.eu
+thegioixekhach.com
+theheroes.ru
+timeallnews.ru
+tizanidine4mguses.blogspot.com
+tizanidine6mg.blogspot.com
+tizanidineandhydrocodone.blogspot.com
+tizanidinehcl4mgtab.blogspot.com
+tizanidineingredients.blogspot.com
+top10-way.com
+topads.men
+topappspro.com
+topcasinoratings.ru
+traffic2money.com
+trafficmania.com
+trk-4.net
+tupper-posuda.ru
+ultimateclassicrock.com
+us-america.ru
+usdx.us
+valuado.com
+varbergsvind.se
+vashsvet.com
 vasileostrovsky-rayon.ru
-viddyoze.com
-vigrx-original.ru
-visa-china.ru
-vksaver-all.ru
-vseigru.one
-vzlomsn.org
-wallpaperaccess.com
-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
-yougame.biz
-youtubedownload.org
-yuweng.info
-zaapplesales.blogspot.com
-zhorapankratov7.blogspot.com
-zvooq.eu
+vgoloveboli.net
+vpnmouse.com
+wahicbefa31.soup.io
+wdrake.com
+webradiology.ru
+webscouter.net
+website-analyzer.info
+weprik.ru
+westsextube.com
+womama.ru
+woman-h.ru
+wosik-dach.service-for-web.de
+x-diesel.com
+xn--b1ag5cfn.xn--p1ai
+xn--c1acygb.xn--p1ai
+xn--l1aengat.xn--p1ai
+xvideosporn.biz
+yoopsie.com
+zeroredirect11.com
+znakomstvaonlain.ru
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index 3656720f2..b2122ba99 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,21 +1,11 @@
-<!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>
+<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>
-<html>
+ml><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 3656720f2..b2122ba99 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.txt
@@ -1,21 +1,11 @@
-<!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>
+<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>
-<html>
+ml><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 a5f544ae0..755513aa7 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.10.37	0;
+35.196.158.85	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 71cc0f1eb..26d5c9c1c 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 aaf81a922..97f73e520 100644
Binary files a/.latest_release/conf.d.tar.gz and b/.latest_release/conf.d.tar.gz differ