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 fb87e15aa..cc3de7218 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.196.158.85	1;
+34.66.200.49	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 755513aa7..1d3684d1d 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.196.158.85	0;
+34.66.200.49	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 fb87e15aa..cc3de7218 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.196.158.85	1;
+34.66.200.49	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 755513aa7..1d3684d1d 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.196.158.85	0;
+34.66.200.49	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 fb87e15aa..cc3de7218 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.196.158.85	1;
+34.66.200.49	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 755513aa7..1d3684d1d 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.196.158.85	0;
+34.66.200.49	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 719bd636b..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.196.72.151           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 866a53036..66808fb4d 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.196.72.151	1;
+35.188.15.155	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index 118499141..82a85f46f 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.196.72.151	0;
+35.188.15.155	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
index 866a53036..66808fb4d 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.196.72.151	1;
+35.188.15.155	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index 118499141..82a85f46f 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.196.72.151	0;
+35.188.15.155	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
index 866a53036..66808fb4d 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.196.72.151	1;
+35.188.15.155	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
index 118499141..82a85f46f 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.196.72.151	0;
+35.188.15.155	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 a49f3d1b8..3094f666a 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +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.227.97.188           0;
+35.202.245.105          0;
+35.188.15.155           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 09ffce01c..7fd2f90fa 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.196.72.151           0;
-35.237.56.208           0;
+34.66.50.208            0;
+35.192.91.101           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 ce63e1ad4..7fd2f90fa 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,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.237.56.208           0;
-34.74.79.111            0;
-35.196.72.151           0;
+34.66.50.208            0;
+35.192.91.101           0;
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index fb87e15aa..cc3de7218 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.196.158.85	1;
+34.66.200.49	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 34390c6a5..41962f4ac 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 @@
-Discobot
-DSearch
-Extreme Picture Finder
-MIIxpc
-RSSingBot
-sexsearcher
-Sitevigil
-Sottopop
-V-BOT
-Web Fuck
+AiHitBot
+Attach
+IDBTE4M
+JamesBOT
+Kenjin Spider
+RankingBot
+Searchestate
+SiteSnagger
+Steeler
+WebCollage
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index cf9173a2a..23251f770 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
-ADmantX
+404enemy
+Aboundexbot
+Acunetix
 AhrefsBot
-AiHitBot
+AIBOT
 AllSubmitter
 AlphaBot
-Anarchie
-Anarchy
+Anthill
 Apexoo
-archive.org_bot
-Asterias
-Attach
-AwarioRssBot
-Backlink-Ceck
-backlink-check
+autoemailspider
 Badass
-Battleztar Bazinga
-BBBike
+Barkrowler
 BDCbot
+Blackboard
 BlackWidow
-BLEXBot
 Blow
-Bolt
+BlowFish
+Boardreader
 Brandprotect
-Buddy
-BuiltBotTough
-Bullseye
-CATExplorador
-CazoodleBot
+BunnySlippers
+BuzzSumo
 CCBot
 Cegbfeieh
 CensysInspect
-check1.exe
+CheeseBot
 CherryPicker
-Claritybot
-Cloud mapping
+CheTeam
+Chlooe
+Cliqzbot
+coccocbot-web
 Cocolyzebot
-com.plumanalytics
+Collector
+Copier
 CopyRightCheck
-Cosmos
+Copyscape
+crawler.feedback
 crawl.sogou.com
-CrazyWebCrawler
-CrunchBot
-Custo
+CSHttp
 DatabaseDriverMysqli
-DataCha0s
+DBLBot
+demandbase-bot
+Demon
+Devil
 DigitalPebble
-Discobot
-Discoverybot
-DnyzBot
+DIIbot
+Disco
+DomainAppender
+DomainCrawler
+Domains Project
 domainsproject.org
-Dotbot
+Dragonfly
+DSearch
+DTS Agent
 Ebingbong
+eCatch
 ECCP/1.0
 EirGrabber
-EMail Siphon
 EMail Wolf
-evc-batch
+Evil
 ExtLinksBot
-Extreme Picture Finder
 EyeNetIE
 Ezooms
 facebookscraper
-FemtosearchBot
-FlashGet
-FrontPage
-Fuzz
-Fyrebot
-GalaxyBot
-GermCrawler
-Gigabot
+FHscan
+Fimap
+Freeuploader
+Getintent
+G-i-g-a-b-o-t
+gopher
 Gotit
-GoZilla
-Go!Zilla
-Grabber
+GrabNet
+GrapeFX
 GrapeshotCrawler
-Haansoft
 HaosouSpider
 heritrix
-HTTP::Lite
-HTTrack
-Humanlinks
-HybridBot
-IDBTE4M
-Id-search
+Hloader
+Iblog
+IDBot
+Image Fetch
 Image Sucker
-IndeedBot
-InfoNaviRobot
-InfoTekies
+Indy Library
+instabid
 Intelliseek
-Internet Ninja
-InternetSeer
-internetVista monitor
-ips-agent
-Jbrofuzz
+InterGET
+Iria
 JennyBot
+Jetty
+JOC Web Spider
+Joomla
 JustView
 Kenjin Spider
-Keyword Density
-Kozmosbot
 Lanshanbot
+Larbin
+LeechFTP
+LeechGet
+LexiBot
+Lftp
 Lightspeedsystems
+Linkbot
+LinkextractorPro
+LinkpadBot
 LinksManager
-LinqiaMetadataDownloaderBot
-LinqiaScrapeBot
+LinkWalker
+Lipperhey
+Litemage_walker
 Lmspider
 LNSpiderguy
-Mag-Net
+lwp-request
+LWP::Simple
 magpie-crawler
+Mail.RU_Bot
 Majestic12
-Majestic SEO
 MarkMonitor
-MauiBot
-Mediatoolkitbot
+MarkWatch
+Masscan
+Mb2345Browser
 mediawords
-MicroMessenger
-Microsoft Data Access
+Metauri
 MIDown tool
 MIIxpc
-Moblie Safari
-MSIECrawler
-Msrabot
+Mister PiX
+MJ12bot
+Mozlila
+MSFrontPage
+Musobot
 Name Intelligence
-Navroad
+Nameprotect
+NearSite
+NetAnts
 netEstate NE Crawler
 NetLyzer
 Nettrack
-Netvibes
-Nibbler
-Niki-bot
+NetZIP
+NextGenSearchBot
+NICErsPRO
+NimbleCrawler
+Nimbostratus
 Ninja
-NPbot
-oBot
+Nmap
+Nutch
 Offline Explorer
 Offline Navigator
-OpenLinkProfiler
-OpenVAS
-OutfoxBot
-page scorer
-Petalbot
+Openvas
+OrangeBot
+Page Analyzer
+PageThing.com
+PECL::HTTP
+PeoplePal
+PHPCrawl
+Picscout
+PictureFinder
+Piepmatz
 Pimonster
-Pi-Monster
 Pixray
 PleaseCrawl
-Pockey
-probe-image-size
-Pump
-PxBroker
-PyCurl
-RankActive
+polaris version
+Probethenet
+ProWebWalker
+Psbot
+Pu_iN
 RankFlex
-RebelMouse
-Recorder
+RankingBot
+RankurBot
+RealDownload
+RedesScrapy
 RepoMonkey
+Ripper
+RocketCrawler
 RSSingBot
 SalesIntelligent
-satoristudio.net
 ScanAlert
-Scrapy
+Scanbot
+scan.lol
+Screaming
 ScrepyBot
-SearchmetricsBot
 SemrushBot
 SentiBot
 seobility
+SeobilityBot
 SEOlyticsCrawler
-Seomoz
+SEOprofiler
 seoscanners
-sexsearcher
+seostar
+serpstatbot
 Shodan
-Sitebeam
-SiteLockSpider
-SlySearch
-SMTBot
-Snake
-Snoopy
-Sosospider
+SISTRIX
+sitechecker.pro
+siteripz
+Site Sucker
+SmartDownload
+Sociscraper
+sogouspider
+Sottopop
+SpaceBison
 Spammen
+SpankBot
 Spanner
-sp_auditbot
-Spbot
-Sucuri
+SputnikBot
+spyfu
+Steeler
+Stripper
 SuperHTTP
 Surfbot
+Suzuran
+Swiftbot
 sysscan
-Szukacz
 T0PHackTeam
 Teleport
+Telesoft
 Telesphoreo
-The Intraformant
-TightTwatBot
-Titan
+TheNomad
+Thumbor
 Toata
-Toweyabot
-Tracemyfile
-Trendiction
-Trendictionbot
-trendiction.de
+True_Robot
 Turnitin
 TurnitinBot
 Typhoeus
-Upflow
-URLy.Warning
-Vacuum
-Vagabondo
-V-BOT
-VB Project
-VelenPublicWebCrawler
+UnisterBot
+VCI
 VeriCiteCrawler
-VidibleScraper
 Virusdie
 Voltron
+voyagerx.com
 Wallpapers/3.0
-WallpapersHD
-WebBandit
-WebCollage
+Web Auto
 WebCopier
-WebFetch
-WebFuck
+WEBDAV
+WebEnhancer
 Web Fuck
-WebGo IS
-WebLeacher
-webmeup-crawler
-WebPix
-Web Pix
+WebImageCollector
 WebReaper
-Web Sauger
-WebWhacker
-WeSEE
-Whack
-Whacker
+WebsiteExtractor
+WebsiteQuester
+WebStripper
 Whatweb
+Who.is Bot
 WinHTTrack
-Wonderbot
 Woobot
 Wotbox
-Wprecon
-WWW-Collector-E
-WWW::Mechanize
-x09Mozilla
-x22Mozilla
+WPScan
+WWWOFFLE
+Xaldon WebSpider
 Xenu
-Zade
 zauba.io
-Zermelo
-ZmEu
+Zeus
+zgrab
 ZoomBot
+ZoominfoBot
+ZumBot
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index 2a74934bd..574bf2638 100644
--- a/.dev-tools/test_units/random-bots-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-bots-for-whitelist-test.list
@@ -1,250 +1,250 @@
-360Spider
-80legs
 Aboundex
-AfD-Verbotsverfahren
-AiHitBot
+Aboundexbot
+ADmantX
+AhrefsBot
+Aipbot
 Alexibot
-AlphaBot
-AwarioSmartBot
+Alligator
+Anarchie
+Anarchy99
+arquivo.pt
+Aspiegel
+Attach
+backlink-check
 BacklinkCrawler
-BackWeb
-Badass
-Battleztar Bazinga
-BetaBot
-Bigfoot
+Bandit
+Barkrowler
+BatchFTP
+BBBike
+BDFetch
 Bitacle
-Blow
+BlackWidow
+BlowFish
+BotALot
+Brandprotect
 Bullseye
-BuzzSumo
 Calculon
 CATExplorador
-CazoodleBot
+CCBot
 Cegbfeieh
 CensysInspect
 check1.exe
+CheTeam
 Chlooe
 Cloud mapping
-cognitiveseo
+coccocbot-web
+Cocolyzebot
+Cogentbot
+Collector
 com.plumanalytics
 CopyRightCheck
+Cosmos
 Craftbot
-crawler.feedback
-crawl.sogou.com
+crawler4j
 CrazyWebCrawler
-CrunchBot
+Crescent
 CSHttp
 Custo
-CyotekWebCopy
-DatabaseDriverMysqli
-DBLBot
+DataCha0s
 demandbase-bot
 Deusu
-Digincore
-DigitalPebble
 Dirbuster
-Disco
-Discobot
-Dispatch
+Discoverybot
+DittoSpyder
 DnyzBot
-DomainCrawler
-DomainSigmaCrawler
 Domains Project
-Dragonfly
-Ebingbong
+DomCopBot
+DSearch
 ECCP/1.0
+Ecxi
 EirGrabber
-Exabot
-ExtLinksBot
-Extractor
-ExtractorPro
-Extreme Picture Finder
-FDM
-FemtosearchBot
+EMail Siphon
+evc-batch
+Evil
+EyeNetIE
+Ezooms
 FHscan
-Fimap
+Firefox/7.0
+FlashGet
+Foobot
+FrontPage
 Fyrebot
-Genieo
-GetWeb
+Getintent
+Gigabot
+gopher
 Gotit
-GoZilla
-Grabber
+Go!Zilla
 GrabNet
-GridBot
+Grafula
+GrapeFX
 Haansoft
-Havij
+HEADMasterSEO
 heritrix
+Heritrix
+Hloader
 HTMLparser
-Iblog
+HTTrack
+IDBot
 IDBTE4M
 Id-search
-Image Sucker
+IlseBot
+IndeedBot
 Indy Library
-InfoTekies
-instabid
-Intelliseek
-internetVista monitor
+InfoNaviRobot
+InterGET
+ips-agent
 IRLbot
 IstellaBot
 JamesBOT
-Jbrofuzz
-JennyBot
-Jetty
-JikeSpider
+JustView
 Jyxobot
-Kenjin Spider
-Keyword Density
-Kinza
-Larbin
-LeechFTP
-LieBaoFast
-Linkbot
-Linkdexbot
-LinkScan
-LinksManager
-LinkWalker
-LinqiaRSSBot
+Lanshanbot
+LexiBot
+Lightspeedsystems
+LinkextractorPro
+LinqiaScrapeBot
 Lipperhey
-Lipperhey Spider
-Litemage_walker
-magpie-crawler
-MarkMonitor
-Masscan
-Mass Downloader
+LNSpiderguy
+lwp-request
+lwp-trivial
+Magnet
+Majestic SEO
 Mata Hari
 Mb2345Browser
+meanpathbot
+Meanpathbot
 mediawords
-MegaIndex.ru
 Metauri
-MicroMessenger
-Microsoft Data Access
+MFC_Tear_Sample
+Microsoft URL Control
 MIIxpc
-Mister PiX
-MJ12bot
 Moblie Safari
-Morfeus Fucking Scanner
+Mojeek
 Mozlila
-MQQBrowser
-MSFrontPage
+Mr.4x3
+MSIECrawler
 Msrabot
 muhstik-scan
-Musobot
-netEstate NE Crawler
-NetMechanic
+Nameprotect
+NearSite
+Needle
+NetAnts
 NetSpider
 Nettrack
-Netvibes
-Ninja
+NextGenSearchBot
+Niki-bot
+Nikto
+Nmap
 NPbot
+Nuclei
+Nutch
 oBot
+Octopus
 Offline Explorer
-OnCrawl
-OrangeSpider
-Page Analyzer
+Openfind
+OrangeBot
+OutclicksBot
+OutfoxBot
+PageGrabber
+Pandalytics
 Panscient
-Petalbot
-PHPCrawl
+Papa Foto
+Pavuk
 Picscout
-Picsearch
-Piepmatz
-Pi-Monster
-plumanalytics
-Pockey
-POE-Component-Client-HTTP
-polaris version
+Pixray
+probe-image-size
+Probethenet
 Psbot
-Pu_iN
-PxBroker
-Quick-Crawler
+PyCurl
 RankActive
-RankActiveLinkBot
-RankingBot
 RankurBot
 Reaper
-RedesScrapy
-RepoMonkey
-Re-re
-RocketCrawler
-Rogerbot
+Recorder
+s1z.ru
+SalesIntelligent
 satoristudio.net
 ScanAlert
-Scanbot
-ScoutJet
+Searchestate
+SearchmetricsBot
 Semrush
-SeobilityBot
-SEOkicks-Robot
-Seomoz
+seobility
+SEOkicks
 SEOprofiler
 seoscanners
-SeoSiteCheckup
-seostar
 Shodan
+Siphon
 SISTRIX
-sitechecker.pro
+Sitebeam
 SiteExplorer
 SiteSucker
 Site Sucker
-Sitevigil
+SlySearch
+SMTBot
 Snapbot
 Snoopy
+Sociscraper
+sogouspider
+Sosospider
+Sottopop
 SpaceBison
 Spammen
-SpankBot
 sp_auditbot
-Spinn3r
-spyfu
-Stripper
+Spbot
+SputnikBot
+Sqlmap
+Sqworm
 Sucker
 Sucuri
-Swiftbot
-tAkeOut
+Teleport
 TeleportPro
+Telesoft
 The Intraformant
 TheNomad
+TightTwatBot
 Titan
 Toata
-Tracemyfile
-Trendiction
+trendiction.com
 trendiction.de
-TwengaBot
+Turingos
+Turnitin
+Twice
 UnisterBot
 Upflow
+URLy Warning
 URLy.Warning
 Vacuum
-Vagabondo
-VB Project
 VCI
 VeriCiteCrawler
 Virusdie
+VoidEYE
+voyagerx.com
+Wallpapers/3.0
+WallpapersHD
 WASALive-Bot
-Webalta
-Web Collage
-WebFetch
-WebFuck
-Web Fuck
-WebLeacher
-Web Pix
-WebSauger
+WebBandit
+WEBDAV
+Web Enhancer
+WebImageCollector
+webmeup-crawler
+WebReaper
 Web Sauger
-WebsiteExtractor
 Website Quester
-WebStripper
+Webster
+WebSucker
 Web Sucker
 WebWhacker
-WebZIP
-WeSEE
-Whack
+Whacker
 Whatweb
-WiseGuys Robot
-Woobot
-Wotbox
+Who.is Bot
+WinHTTrack
+Wonderbot
+WPScan
 WWW-Mechanize
 WWW::Mechanize
-x09Mozilla
-x22Mozilla
-Xaldon WebSpider
 Zauba
-zauba.io
 Zeus
-ZmEu
+Zitebot
 ZoomBot
 ZoominfoBot
+ZumBot
+ZyBorg
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 2cde22d6f..3650fb448 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 @@
-djstools.com
-ie.57883.net
-lacapilla.info
-obiavo.net
-porndroids.com
-pornodojd.ru
-putevka24.ru
-rubbed.us
-scenicmissouri.us
-screpy.com
+2728fb936f0.com
+2pxg8bcf.top
+flashbannernow.com
+ip-guide.com
+istock-mebel.ru
+konpax.com
+portal-eu.ru
+shakhtar-doneck.ru
+y8games-free.com
+zoosexart.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index 002f72603..2f3b846fb 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 @@
-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
-aac52006ec82a24e08b665f4db2b5013f7.com
-abcdeg.xyz
+100searchengines.com
+178evakuator178.ru
+1millionusd.xyz
+1qingdao.com
+24x7-server-support.site
+2x2fan.ru
+4kepics.com
+5forex.ru
+5tey7463.weebly.com
+777-club.ru
+7zap.com
 academiacsmendoza.org
-acads.net
-accessoires-mode.in
-addray.pro
-adelly.bg
-adimmix.com
+actices.com
+adminshop.com
 adservme.com
-adultwebhosting.info
-adzerg.com
-aghanyna.com
-akvamaster.dp.ua
-alert-fjg.xyz
-aliexpress.com
-alkoravto.ru
-alpharma.net
+ads-seo.men
+afslankpillen2017nl.eu
+agysya.ru
+airlandsea.info
+akuhni.by
+alfa-img.com
+allnews.md
+alphahoverboards.com
 amateurgalls.com
+amazingninja.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
-avtolombard-krasnodar.com
+angkortours.vn
+animali.deagostinipassion.it
+apessay.com
+apidiamondatanet-a.akamaihd.net
+apimountainbikei-a.akamaihd.net
+app5.letmacworkfaster.world
+ap.senai.br
+apxeo.info
+ascat.porn
+ausergrubhof.info
+autochoixspinelli.com
+autodo.info
 awency.com
-babosas.com
-backlinkwatch.com
-backuperwebcam.weebly.com
-baksman.com
-bala.getenjoyment.net
-balkanfarma.ru
-bambi.ck.ua
-bankofthewext.com
+ayakino.net
+azartmsl.com
+azazu.ru
+azbaseimages.net
+azte.ch
+back.dog
+backlink4u.net
+baikaleminer.com
+bank.uz
 bannerbank.ru
-barbourjackets.online
-bayareaaeroclub.org
-belstaffstore.online
-bensbargains.net
+bannerswap.com
 berdasovivan.ru
-beremenyashka.com
-bestpriceninja.com
-betterhdporn.com
-bg6s0.com
+bestssaker.com
+bestwebsitesawards.com
+beztuberkuleza.ru
 bibys.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
+bigames.online
+bigpictures.club
+bioinnovate.co
+bitporno.sx
+bizcheapjerseyswholesalechina.com
+bizzliving.com
+blog.f00kclan.de
+bochemit.com.ua
+bocoarchives.org
+bonzybuddy.com
+book-bets.com
+bosman.pluto.ro
+brainboostingsupplements.org
+brainsandeggs.blogspot.com
+brainzpod.win
+bugof.gq
 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
+buyhoverboard.com
+buzzzg.men
+bwlx.prepedu.cn
+calc-for-credit.ru
+candytiner.com
+casinopinup-wins.com
+cdnanalytics.xyz
+cfjump.com
+cheapcigarettesc.info
+cheapestjerseysonwholesale.com
+cheapmoncler.pw
+check-this-out-now.online
+chorus.terakeet.com
 christianlouboutinsaleoutletonline.us
+cicaki.net
+cinemaenergy-hd.ru
 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
+classiquebijoux.ru
+com-cleaner.systems
+comeondog.info
+compliance-andrew.top
+compliance-don.xyz
+compliance-elena.xyz
+compliance-ivan.top
+contentsexpress.com
+crackzplanet.com
+craftburg.ru
+crafthubs.com
+craftinsta.ru
+creditmoney.com.ua
+credit-respect.ru
+culad.com
 customsua.com.ua
-dandiyabeats.in
-delfin-aqua.com.ua
-delitime.info
-deutschland123.de
-dfiles.me
-diarioaconcagua.com
+czeshop.info
+darmebel.com.ua
+dating-app.ru
+db.speedup.gdn
+decenttools.com
+demian.kz
+designdevise.com
 digest-project.ru
-dikqlyremy.info
-dikx.gdn
-discountbarbour.online
-domznaniy.ru
-dpihatinh.gov.vn
-eandsgallery.com
-earthmagic.info
-easycommerce.cf
-elektir.ru
-elektrischeziga.livejournal.com
-elektroniksigaraankara.info
+diminishedvalueoforegon.com
+discountliv.com
+docsportal.net
+doeco.ru
+doska-vsem.ru
+downloadkakaotalk.com
+downloadmefiranaratb1972.xpg.com.br
+drhomes.biz
+drivotracker.com
+drugs-no-rx.info
+drunkenstepfather.com
+easyshoppermac.com
+e-collantes.com
+e-commerce-seo.com
+elektronischezigarettekaufen1.myblog.de
 elektrozigarettekaufen1.devhub.com
-elkacentr.ru
+elexies.info
+elitedollars.com
+elite-sex-finders.com
 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
-freegamesplay.online
-free-gluten.ru
-freelifetimefuckbook.com
-freetangodownload.com
-fuck-paid-share-buttons.xyz
-galeon.com
-gambarxkata.co
-gamebackyard.com
-gcup.ru
-gelezki.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
-hdwallpapers-free.com
-headpharmacy.com
-heartofbeijing.blogspot.com
-hermesreplica.pw
-highspeed5.net
-host-protection.com
-host-tracker.com
-hotdl.in
-hoterika.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
+elvenar.com
+enbersoft.com
+espaceinventoristes.com
+exchanges-bet.com
+exhibitionplus.eu
+expdom.com
+eyelike.com.ua
+fakehandbags.xyz
+family1st.ca
+fanrto.com
+farmingworm.com
+fashion-stickers.ru
+fickluder69.com
+findsexguide.com
+finstroy.net
+firma-legion.ru
+fivedwld.cf
+fix-website-errors.com
+focalink.com
+fordsonmajbor.cf
+forzeronly.com
+frameimage.org
+freakycheats.com
+free411games.com
+free-laptop-reward.com
+freeseedsonline.com
+freshdz.com
+friendflnder.com
+gabeshop.ru
+galleryawesome.com
+gameprimary.com
+gamevalue7.weebly.com
+gardene.ru
+gaz-voshod.ru
+gdcentre.ru
+gdzkurokam.ru
+geile-lelly.eu
+gembird.com
+gerhardhealer.com
+getaclueamerica.com
+getdot.ru
+gigixo.com
+greatzip.com
+gribkovye-zabolevaniya.com
+grizzlysgrill.com
+gtopstats.com
+guardlink.org
+hausfrauensex18.com
+headpress.ru
+hermesreplica.win
+hidemyass.com
+highland-homes.com
+himazin.info
+honyaku.yahoofs.jp
+hoporno.com
+hothor.se
+hotkeys.com
+housemilan.ru
+howtoclean.club
+https-legalrc.biz
+ibb.com.ua
+ihtec2019.org
+iinstalll-fii1leis.jus0wil.pp.ua
+imagine-ex.co
+imediadesk.com
+imfamous.info
+inboxdollars.com
+infodocsportal.com
+insomniagamingfestival.com
+intellego.info
+interior-stickers.ru
+internetartfair.com
+int.search.mywebsearch.com
+ipchicken.com
+isistaylorporn.info
+islamtoday.co.za
+islandminingsupply.wordpress.com
 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
+itis4you.com
+itsdp3.com
+janettabridal.com
+jikoman.info
+jillepille.com
+job.icivil.ir
+johnrobertsoninc.com
+jolic2.com
+journeydownthescale.info
+jovencitas.gratis
+jpcycles.com
+justprofit.xyz
+jyrxd.com
+karting196.ru
+ketoanhanoi.info
+keywordsuggest.org
+kinoplen.ru
+kleine-titten.biz
+kndxbkdx.bloger.index.hr
+koleso24.com.ua
 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
-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
-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
+konica.kz
+konkursowo-24.pl
+konturkrasoty.ru
+laapp.com
+labelwater.se
+lapitec.eu
+lasvegaslockandsafe.com
+lawyers.cafe
+legalrc.biz
+letmacwork.world
+letto.by
+li-er.ru
+lightinghomes.net
+linkarena.com
+littlesunraiser.com
+livesex-amateure.info
+lizace.com
+lockerz.com
+longadventure.com
+long-beach-air-conditioning.com
+lsex.xyz
+macfix.life
+mackeeper-land-672695126.us-east-1.elb.amazonaws.com
+maglid.ru
+makemoneyonline.com
+malwareremovalcenter.com
+map028.com
+mararoom.ru
+maximilitary.ru
+m.b00kmarks.com
+mebel-alait.ru
+mebeldekor.com.ua
+medosmotr-ufa.ru
+mini.7zap.com
+mini-modus.ru
+mirmedinfo.ru
+mixx.com
+mmoguider.ru
+mobioffertrck.com
+mokrayakiska.com
+moscow-clining.ru
+mp3films.ru
+mp3ringtone.info
+mrbitsandbytes.com
+mrcsa.com.au
 mrinsidesales.com
-muschisexbilder.com
-mxgetcode.com
-mycaf.it
-mycouponizemac.com
-myfreecams.com
-myfreetutorials.com
-mzdish.site
-najaden.no
-narutonaruto.ru
-netfacet.net
-net-profits.xyz
-net-radar.com
-nfvsz.com
-nlfjjunb5.ru
-npoet.ru
-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
-ourtherapy.ru
-owohho.com
-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
+msfsaar.de
+mulberryoutletonlineeu.com
+muz-shoes.ru
+mwtpludn.review
+mydeathspace.com
+mykings.pw
+mylida.org
+myprintscreen.com
+nakrutka.cc
+nalogovyykodeks.ru
+nastroyke.net
+naturalbreakthroughsresearch.com
+nextconseil.com
+nhl17coins.exblog.jp
+no-rx.info
+novosti-hi-tech.ru
+obiavo.uz
+omgtnc.com
+omoikiri-japan.ru
+online7777.com
+online.ktc45.ru
+openlibrary.org
+ororodnik.goodbb.ru
+ossmalta.com
+outclicks.net
+outrageousdeal-a.akamaihd.net
+ownshop.win
+oz-offers.com
+pammik.ru
+papasdelivery.ru
+partybunny.ru
+pc-test.net
+pearlisland.ru
+pelfind.me
+picsforkeywordsuggestion.com
+picturesfrom.com
+pills24h.com
+pix-hd.com
+pl.aasoldes.fr
+pochtovyi-index.ru
+pogruztehnik.ru
+popugauka.ru
+popup.matchmaker.com
 pornoklad.ru
-pornolook.net
 pornoslive.net
-poshiv-chehol.ru
-powenlite24.ru
-prefersurvey.net
-profit-opportunity.com
-prostitutki-astana.org
-prostitutki-kharkova.org
+pornotubexxx.name
+pornoxxx.com.mx
+pornzone.tv
+portal-eu.ru
+portside.cc
+pricheski-video.com
+princeadvantagesales.com
+profitsport.club
+pronorm.fr
+prostitutki-novgoroda.org
 pufip.com
-purplesphere.in
-purplestats.com
-pxhdwsm.com
+pulseonclick.com
+push-ad.com
 qexyfu.bugs3.com
-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
+radiodigital.co
+randki-sex.com
+rangoman.date
+realtytimes.com
+recipedays.ru
+redirectme.net
+reklamuss.ru
+remont-komputerov-notebook.ru
+rentehno.ru
+resant.ru
+retreatia.com
+rewardit.com
+rique.host.sk
+ritlweb.com
+rn-to-bsn.com
 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
-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
+royalcar-ufa.ru
+rukino.org
+rusvideos.su
+sa-live.com
+sandhillsonline.com
+sanidumps.com
+sanjosestartups.com
+sbtdesign.co.uk
+scanner-jack.top
+scanner-jane.top
+screentoolkit.com
+search.1and1.com
+search.pch.com
+secret.xn--oogle-wmc.com
+sei80.com
+seinterface.com
+semaltmedia.com
+senger.atspace.co.uk
+seocdvig.ru
+se-welding.ru
+sex.hotblog.top
+sextracker.be
+sex-tracker.com
+sex-tracker.de
+sexyali.com
+shama-rc.net
+shisha-swag.de
+shmetall.com.ua
+silvercash.com
+simply.net
+sinel.info
+sisiynas.ru
+site5.com
+siteheart.net
+siteripz.net
+site.ru
+smokewithrabbits.com
+sneakyboy.com
+softtor.com
+sohoindia.net
 solicita.info
-sotkal.lark.ru
-space-worry.ml
+souvenirua.com
+space4updating.win
+specialfinanceoffers.com
 special-porn.com
-spinnerco.ca
-srdrvp.com
-stanthonyscatholicchurch.org
-stard.shop
-sterva.cc
-stretchingabuckblog.com
-studentguide.ru
-studworks.org
-superiends.org
+speeddream.xyz
+spl63.fr
+sps-shop.com
+srgwebmail.nl
+sr-rekneskap.no
+strv.se
+sucsesofinspiration.com
+sudexpert66.ru
+sukirgenk.dvrlists.com
 supermama.top
-swinon.site
-tacbibirfa.tk
-tanieaukcje.com.pl
-t-bygg.com
-tds-advert002.info
-thecoolimages.net
-theguardlan.com
-tiens2010.ru
-timer4web.com
+syndicate.fun
+tabakur77.com
+takethatad.com
+teastory.co
+tecnoteakviareggio.it
+templates.radiodigital.co
+tfxiq.com
+thaisamkok.com
+thebestphotos.eu
+thefarmergame.com
+thetardistimes.ovh
+thewebsitetemplate.info
+thexart.club
+tiandeural.ru
+titan-ads.life
+titangel-vietnam.com
 tizanidine4mguses.blogspot.com
-tizanidineinteractions.blogspot.com
-tizanidineoral.blogspot.com
-tizanidinerestlesslegsyndrome.blogspot.com
-tizanidinesideeffectsweightloss.blogspot.com
-tizanidinevscyclobenzaprine.blogspot.com
-tizanidinevsvalium.blogspot.com
-tjkckpytpnje.com
-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
+tizanidineonline.blogspot.com
+topcar-krasnodar.ru
+topcasinoratings.ru
+top-l2.com
+toy-shop.top
+tozup.com
+traffic-club.info
+trafficjunky.net
+traffmonster.info
+tsan.net
+ttsq.fr
+turn-up-life.life
+ua.tc
+ufa.xrus.org
+ugguk.online
 ukkala.xyz
-upproar.com
-url-img.link
-uroki.net
-vasileostrovsky-rayon.ru
-vezuviy.su
-viagra.pp.ua
+ukr-lit.com
+umaseh.com
+umnovocaminho.com
+unacittaconte.org
+uogonline.com
+uptime-delta.net
+urlcut.ru
+urll.eu
+urlopener.com
+usdx.us
+utiblog.fr
+valueclick.com
+vapomnoncri.tk
+varikozdok.ru
+v-doc.co
+videochat.cafe
+videochat.mx
 videogamesecrets.com
-video-production.com
-vinylvault.co.uk
-visitcambridge.org
-vitanail.ru
-viteonlusarezzo.it
-vizag.kharkov.ua
+vielporno.net
+vipsexfinders.com
+viven.host.sk
+vkonche.com
+vkontarkte.com
+volume-pills.biz
+vote-up.ru
 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
-zakazfutbolki.com
-zakazvzloma.com
-zeroredirect10.com
-zeroredirect1.com
-z-master.ru
-znakom.sibtest.ru
-zocaparj.kz
-zs2vm.top
+vzglyadriv.kg
+walkme.com
+warningwar.ru
+warningzscaler.heraeus.com
+webkeyit.com
+white-truck.life
+wingsoffury2.com
+wjgony.com
+wosik-dach.service-for-web.de
+ww1943.ru
+wzgyyq.com
+x69ty.ru
+xjrul.com
+xn-----7kcabaipgeakzcss7bjdqdwpfnhv.xn--p1ai
+xn-----8kcatubaocd1bneepefojs1h2e.xn--p1ai
+xn--90acenikpebbdd4f6d.xn--p1ai
+xn--d1aifoe0a9a.top
+xn--h1ahbi.com.ua
+xn----itbeirbjbi7bc6bh2d.xn--p1ai
+xn----itbkqkfiq.xn--p1ai
+xxx-treker.ru
+xz618.com
+yellowfootprints.com
+yopoint.in
+yoursite.com
+ytmnd.com
+zacreditom.ru
+zastenchivosti.net
+zigarettenonlinekaufen1.blox.pl
+zophim.me
+zvezdagedon.ru
+zzlgxh.com
diff --git a/.dev-tools/test_units/random-referrers-for-whitelist-test.list b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
index b7f0a67b0..831df937d 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 @@
-214jaluwobapef.cf
-2345.com
-2nt.ru
-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
-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
+0c47f8422d3f.com
+1stat.ru
+aaronabel.com
+addray.pro
+adidas.frwebs.fr
+adrenalin-stk.ru
+adsloads.com
+adultfriendfinder.com
+advancedcleaner.com
+aktivator-windows10.blogspot.com
+allknow.info
+alphahoverboards.com
+animal36.com
+apartmentbay.ru
+apiadanaknet-a.akamaihd.net
+apibetweenlinesn-a.akamaihd.net
+apifasterlightin-a.akamaihd.net
+auto-zapchasti.org
+avitocars.ru
+axbocz.net
+azlex.uz
+balkanfarma.ru
+bard-real.com.ua
+berlininsl.com
+bestadbid.com
+bestempresas.es
+bestfortraders.com
+besthomemadepornsites.com
+best-way.men
+bookmark4you.com
+braintobe.win
+browsepulse-a.akamaihd.net
+buckspar.gq
+buketeg.xyz
+bum.com.ru
+buron.pw
+buyfriend.ru
+buyscabiescream.com
+buzzurl.jp
+californianews.cf
+callawaygolfstore.online
+candcstuccoandstone.com
+candiceloves.us
+casinopinup-wins.com
+cctva.tv
+centre-indigo.org.ua
+cerev.info
+cheapbelstaff.online
+checkhit.com
+checktext.org
+cialisovercounteratwalmartusa.com
+clicksor.net
+clickzzs.nl
+clksite.com
+com-cleaner.systems
+companies-catalog.com
+compliance-checker.info
+cottageofgrace.com
+digital-video-processing.com
+dipstar.org
+dolohen.com
+domoysshop.ru
+downvids.net
+doxyporno.com
+drillsaw.ru
+drupa.com
+dtm-spain.com
 educatemetv.com
-edudocs.net
-elektrozigarettekaufen2.blogse.nl
-elkacentr.ru
-englishdictionaryfree.com
-eorogo.top
-family1st.ca
-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
+electrik-avenue.com
+elektrischezigarettekaufen2.cowblog.fr
+elitepcgames.com
+energy-ua.com
+enternet.ee
+eonpal.com
+epicbrogaming.com
+este-line.com.ua
+estibot.com
+ezigarettekaufen1.hpage.com
+ezigarettekaufen2.yolasite.com
+f00kclan.de
+fealq.com
+filmfanatic.com
+finuse.com
+flavors.me
+forsex.info
+fotoxxxru.com
+foxinsocks.ru
+freefoto.ca
+freejabs.com
+fr.netlog.com
+funponsel.com
+game-top.su
+ge0ip.org
+gelezki.com
 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
-johnrobertsoninc.com
-karachev-city.ru
-karaganda.xkaz.org
-kazan.zrus.org
-kazrent.com
-kino-rating.ru
-lasvegaslockandsafe.com
-law-check-nine.xyz
-lazy-z.com
+gotorussia.com
+gov.yanao.ru
+greenshop.su
+greenzaim.ru
+guidefs.ru
+hawaiielectriclight.com
+hermesbirkinhandbagoutlets.com
+homemature.net
+hotgirlhdwallpaper.com
+houdom.net
+ibb.com.ua
+iboss.com
+inboundlinks.win
+inclk.com
+instasexyblog.com
+iqoption.com
+irkutsk.zrus.org
+isistaylorporn.info
+itrevolution.cf
+izoll.ru
+janavibekken.no
+junglenet-a.akamaihd.net
+kochanelli.com
+lashstudia.ru
 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
+lecbter-relationships.ga
+lifehacĸer.com
+localflirtbuddies.com
+localmatchbook.com
+lolnex.us
+lost-alpha.ru
+lunchrock.co
+m3gadownload.pl
+mansparskats.com
+maridan.com.ua
+marketland.ml
+mebel-alait.ru
+metabar.ru
+meteostate.com
+michaelkorsoutlet.store
+michellblog.online
 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
+mikozstop.com
+minecraft-rus.org
+mmog-play.ru
+mnogolok.info
+mobilierland.com
+modenamebel.ru
+mompussy.net
+monclerjacketsoutlet.pw
+mossmesi.com
+moxo.com
+mydearest.co
+nakrutka.cc
+nodup.ru
+nowtorrents.com
+obesidadealgarve.com
+onemantrip.com
+online-hd.pl
 onlinemegax.com
-panchro.xyz
-papasdelivery.ru
-peekyou.com
-pelfind.me
-pinapchik.com
-pisanieprac.info
-pornogig.com
-pornoklad.ru
-preparevideosafesystem4unow.site
-profit-opportunity.com
-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
+ons-add.men
+onstrapon.purplesphere.in
+o-o-6-o-o.com
+ostrovtaxi.ru
+paradontozanet.ru
+perm-profnastil.ru
+photo-clip.ru
+photokitchendesign.com
+platesauto.com
+pochemychka.net
+pogruztehnik.ru
+porno-dojki.net
+pospr.waw.pl
+powenlite24.ru
+presleycollectibles.com
+privacylocationforloc.com
+prize44.com
+prosmibank.ru
+quizzitch.net
+razvratnoe.org
+rebrand.ly
+respublica-otel.ru
+rfd-split.hr
+risparmiocasa.bz.it
+saugatuck.com
+savefrom.com
+sbprabooks.com
+scanner-jess.top
 sdelai-prosto.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
+search.1and1.com
+search-error.com
+searchimage.co
+searchlock.com
+seminarykansas904.ml
+seolab.top
+seorussian.ru
+shopsellcardsdumps.com
+shopvilleroyboch.com.ua
+shtora66.ru
+sim-service.net
+sindragosa.comxa.com
+sitevalued.com
+s.lollypopgaming.com
+snjatie-geroinovoy-lomki.ru
+soft-terminal.ru
+solinf.co
+sovinsteel.ru
+spywareit.com
+staticfs.host
+superkanpo.com
+svolze.com
+swagbucks.com
+swinginwithme.ru
+tds-advert002.info
+technopellet.gr
+tehngr.ru
+theallgirlarcade.com
+thebestphotos.eu
 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
-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
+timecrimea.ru
+tivolibasket.it
+trudogolik.net
+urdoot.win
+videochat.cafe
+vip2ch.com
+visa-pasport.ru
+vladhistory.com
+voluumtracker1.com
+voluumtrk.com
+vozbujdenie.com
+webadvance.club
+webmonetizer.net
+webs.com
+wechatdownload10.com
+wemarketing.se
+whipme.yopoint.in
+wrona.it
+ws.ampower.me
+x69ty.ru
+xep.info
+xitjw.info
+xjrul.com
+xn--80aanaardaperhcem4a6i.com
+xn--80aodinpgi.xn--p1ai
+xn----dtbndd4ae7eub.top
+xxlargepop.com
+xxxasianporn.net
+yadro.ru
+yhit.press
+youporn-ru.com
+yourothersite.com
+yourporngay.com
+yoursearch.me
+zastenchivosti.net
+zrelaya.pw
diff --git a/.dev-tools/test_units/ratelimittest-beta.txt b/.dev-tools/test_units/ratelimittest-beta.txt
index b2122ba99..f0474a154 100644
--- a/.dev-tools/test_units/ratelimittest-beta.txt
+++ b/.dev-tools/test_units/ratelimittest-beta.txt
@@ -1,11 +1,21 @@
-<html>
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
+</html><html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body>
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.18.0 (Ubuntu)</center>
 </body>
 </html>
-ml><html>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body>
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -571,14 +581,4 @@ ml><html>
 <h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
 <p>This is merely used for testing !!!</p>
 </body>
-</html><!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to NginX</title>
-</head>
-<body>
-<div align=center>
-<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
-<p>This is merely used for testing !!!</p>
-</body>
 </html>
\ No newline at end of file
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index b2122ba99..3c54e5485 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.txt
@@ -5,13 +5,6 @@
 <hr><center>nginx/1.18.0 (Ubuntu)</center>
 </body>
 </html>
-ml><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>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body>
diff --git a/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index 755513aa7..1d3684d1d 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.196.158.85	0;
+34.66.200.49	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 26d5c9c1c..cc96aec42 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 97f73e520..e79ae2b79 100644
Binary files a/.latest_release/conf.d.tar.gz and b/.latest_release/conf.d.tar.gz differ