diff --git a/bots.d/bad-referrer-words.conf b/bots.d/bad-referrer-words.conf
index 737f2f4cc..ab72ebd7a 100644
--- a/bots.d/bad-referrer-words.conf
+++ b/bots.d/bad-referrer-words.conf
@@ -2,8 +2,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2017.03
-### Updated: Mon Aug  21 11:29:32 SAST 2017
+### Version: V3.2017.04
+### Updated: Mon Oct  02 16:41:32 SAST 2017
 ###################################################
 ### VERSION INFORMATION ##
 
@@ -42,18 +42,25 @@
 
 # Think very carefully before you add any word here
 
-	"~*adultgalls"		1;
-	"~*amateurxpass"		1;
-	"~*bigblackbooty"		1;
-	"~*blacktits"		1;
-	"~*cookie\-law\-enforcement"		1;
-	"~*free\-share\-buttons"		1;
-	"~*free\-social\-buttons"		1;
-	"~*fuck\-paid\-share\-buttons"		1;
-	"~*ilovevitaly"		1;
-	"~*law\-enforcement\-bot"		1;
-	"~*law\-enforcement\-check"		1;
-	"~*share\-buttons\-for\-free"		1;
-	"~*webfuck"		1;
-	"~*xxxrus"		1;
-	"~*zeroredirect"		1;
+# *****************************************************************************************
+# PLEASE MAKE SURE that you use word regex boundaries to avoid false positive detection !!!
+# *****************************************************************************************
+
+# As you can see in the examples below the word "adultgalls" is entered with a preceding \b and an ending \b
+# this makes it now "\badultgalls\b". It is crucial to use the word boundaries regex formatting. 
+
+	"~*\badultgalls\b"					1;
+	"~*\bamateurxpass\b"				1;
+	"~*\bbigblackbooty\b"				1;
+	"~*\bblacktits\b"					1;
+	"~*\bcookie\-law\-enforcement\b"	1;
+	"~*\bfree\-share\-buttons\b"		1;
+	"~*\bfree\-social\-buttons\b"		1;
+	"~*\bfuck\-paid\-share\-buttons\b"	1;
+	"~*\bilovevitaly\b"					1;
+	"~*\blaw\-enforcement\-bot\b"		1;
+	"~*\blaw\-enforcement\-check\b"		1;
+	"~*\bshare\-buttons\-for\-free\b"	1;
+	"~*\bwebfuck\b"						1;
+	"~*\bxxxrus\b"						1;
+	"~*\bzeroredirect\b"				1;
diff --git a/bots.d/blacklist-domains.conf b/bots.d/blacklist-domains.conf
index 1795f42e0..061e762e1 100644
--- a/bots.d/blacklist-domains.conf
+++ b/bots.d/blacklist-domains.conf
@@ -2,8 +2,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2017.01
-### Updated: Fri Sep  22 09:57:32 SAST 2017
+### Version: V3.2017.02
+### Updated: Mon Oct  02 16:48:32 SAST 2017
 ###################################################
 ### VERSION INFORMATION ##
 
@@ -28,5 +28,12 @@
 # For example myblacklisteddomainname.com should be entered as myfirstowndomainname\.com
 # and my-second-blacklisted.com should be entered as my\-second\-owndomainname\.com
 
-"~*myblacklisteddomainname\.com" 		1;
-"~*my\-second\-blacklisted\.com"		1;
+# *****************************************************************************************
+# PLEASE MAKE SURE that you use word regex boundaries to avoid false positive detection !!!
+# *****************************************************************************************
+
+# As you can see in the examples below the domain "myblacklisteddomainname\.com" is entered with a preceding \b and an ending \b
+# this makes it now "\bmyblacklisteddomainname\.com\b". It is crucial to use the word boundaries regex formatting. 
+
+"~*\bmyblacklisteddomainname\.com\b" 		1;
+"~*\bmy\-second\-blacklisted\.com\b"		1;
diff --git a/bots.d/custom-bad-referrers.conf b/bots.d/custom-bad-referrers.conf
index a0b161266..5b1f5935f 100644
--- a/bots.d/custom-bad-referrers.conf
+++ b/bots.d/custom-bad-referrers.conf
@@ -2,8 +2,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2017.02
-### Updated: Mon Aug  21 11:29:32 SAST 2017
+### Version: V3.2017.03
+### Updated: Mon Oct  02 16:50:32 SAST 2017
 ###################################################
 ### VERSION INFORMATION ##
 
@@ -27,8 +27,18 @@
 # For example some-veryvery-randomwebsitename-thatdoesnotexist4.com should be entered as
 # some\-veryvery\-randomwebsitename\-thatdoesnotexist4\.com
 
-	"~*someveryveryrandomwebsitenamethatdoesnotexist1\.com"			1;
-	"~*someveryveryrandomwebsitenamethatdoesnotexist2\.com"			1;
-	"~*someveryveryrandomwebsitenamethatdoesnotexist3\.com" 		1;
-	"~*some\-veryvery\-randomweb\-sitenamethatdoesnotexist4\.com" 	1;
+# *****************************************************************************************
+# PLEASE MAKE SURE that you use word regex boundaries to avoid false positive detection !!!
+# *****************************************************************************************
+
+# As you can see in the examples below the domain "someveryveryrandomwebsitenamethatdoesnotexist1\.com" 
+# is entered with a preceding \b and an ending \b
+# this makes it now "\bsomeveryveryrandomwebsitenamethatdoesnotexist1\.com\b". 
+# It is crucial to use the word boundaries regex formatting. 
+
+
+	"~*\bsomeveryveryrandomwebsitenamethatdoesnotexist1\.com\b"			1;
+	"~*\bsomeveryveryrandomwebsitenamethatdoesnotexist2\.com\b"			1;
+	"~*\bsomeveryveryrandomwebsitenamethatdoesnotexist3\.com\b" 		1;
+	"~*\bsome\-veryvery\-randomweb\-sitenamethatdoesnotexist4\.com\b" 	1;
 	
\ No newline at end of file
diff --git a/bots.d/whitelist-domains.conf b/bots.d/whitelist-domains.conf
index ad3fa34da..e575d93b7 100644
--- a/bots.d/whitelist-domains.conf
+++ b/bots.d/whitelist-domains.conf
@@ -2,8 +2,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2017.01
-### Updated: Mon Aug  21 11:31:32 SAST 2017
+### Version: V3.2017.02
+### Updated: Mon Oct  02 16:52:32 SAST 2017
 ###################################################
 ### VERSION INFORMATION ##
 
@@ -28,5 +28,12 @@
 # For example myfirstowndomainname.com should be entered as myfirstowndomainname\.com
 # and my-second-owndomainname.com should be entered as my\-second\-owndomainname\.com
 
-"~*myfirstowndomainname\.com" 			0;
-"~*my\-second\-owndomainname\.com"		0;
+# *****************************************************************************************
+# PLEASE MAKE SURE that you use word regex boundaries to avoid false positive detection !!!
+# *****************************************************************************************
+
+# As you can see in the examples below the domain "myfirstowndomainname\.com" is entered with a preceding \b and an ending \b
+# this makes it now "\bmyfirstowndomainname\.com\b". It is crucial to use the word boundaries regex formatting. 
+
+"~*\bmyfirstowndomainname\.com\b" 			0;
+"~*\bmy\-second\-owndomainname\.com\b"		0;