diff --git a/redirector.php b/redirector.php
index 404ca7d..cbc72d6 100644
--- a/redirector.php
+++ b/redirector.php
@@ -59,7 +59,12 @@
     	showErrorPage();
     }
     
+    
+    $_SUBTAG = substr($_TAG, stripos($_TAG, '/');
+    $_TAG = substr($_TAG, 0, stripos($_TAG, '/');
+        
     # strip potentially bad characters from file
+    $_SUBTAG = preg_replace('/["\'?%$#@!;*&]/i', '', $_SUBTAG);
 	$_TAG = preg_replace('/["\'?%$#@!;*&]/i', '', $_TAG);
 
 
@@ -89,7 +94,7 @@
   					TimeClicked) VALUES (
   					NULL,
   					" . $App->returnQuotedString($_TAG) . ",
-  					NULL,
+  					" . $App->returnQuotedString($_SUBTAG) . ",
   					" . $App->returnQuotedString($client_hostname) . ",
   					NOW())";