diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index e8a9d2c2..c83116fc 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1086,7 +1086,7 @@
 		{
 			default:
 			{
-				cb_call_functions('categoryListing',$params);
+				 cb_call_functions('categoryListing',$params);
 			}
 			break;
 			
@@ -4988,14 +4988,14 @@
 		$queryString = $_SERVER['QUERY_STRING'];
 		
 		if($var)
-		$queryString = preg_replace("/$var=([\w+\s\b]+|)/","",$queryString);
+		$queryString = preg_replace("/&?$var=([\w+\s\b\.?\S]+|)/","",$queryString);
 		if($remove)
 		{
 			if(!is_array($remove))
-			$queryString = preg_replace("/$remove=([\w+\s\b]+|)/","",$queryString);
+			$queryString = preg_replace("/&?$remove=([\w+\s\b\.?\S]+|)/","",$queryString);
 			else
 			foreach($remove as $rm)
-				$queryString = preg_replace("/$rm=([\w+\s\b]+|)/","",$queryString);
+				$queryString = preg_replace("/&?$rm=([\w+\s\b\.?\S]+|)/","",$queryString);
 			
 		}
 		
diff --git a/upload/module.php b/upload/module.php
index fc011e3a..30896742 100644
--- a/upload/module.php
+++ b/upload/module.php
@@ -8,13 +8,16 @@
 */
 
 define("IN_MODULE",true);
+define("THIS_PAGE",$_GET["p"]);
+define("PARENT_PAGE",$_GET["s"]);
+
 require 'includes/config.inc.php';
 $pages->page_redir();
 
-if(is_installed('editorspick'))
+/*if(is_installed('editorspick'))
 {
 	assign('editor_picks',get_ep_videos());
-}
+}*/
 
 //i love coding :)