diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 535277ee2..46decd5c6 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -969,12 +969,12 @@ class e_form
 	}
 
 	/**
-	 * Internal Function used by imagepicker and filepicker
+	 * Internal Function used by imagepicker, filepicker, mediapicker()
 	 */ 
 	private function mediaUrl($category = '', $label = '', $tagid='', $extras=null)
 	{
 		
-		$cat = ($category) ? '&for='.$category : "";
+		$cat = ($category) ? '&for='.urlencode($category) : "";
 		if(!$label) $label = ' Upload an image or file';
 		if($tagid) $cat .= '&tagid='.$tagid; 
 		
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index e9b994e07..d324101c9 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -436,9 +436,9 @@ class e_media
 	}
 	
 	
-	public function getFiles($from=0, $amount = null, $search = null)
+	public function getFiles($cat, $from=0, $amount = null, $search = null)
 	{
-		return $this->getImages('_common_file', $from, $amount, $search);	
+		return $this->getMedia('application', $from, $amount, $search);
 	}
 
 
@@ -484,9 +484,6 @@ class e_media
 		if(strpos($cat,"+") || !$cat)
 		{
 			$cat = str_replace("+","",$cat);
-			// $inc[] = "media_category = '_common_image' ";
-		//	$inc[] = "media_category REGEXP '(^|,)(_common_image)(,|$)' "; 
-		//		$inc[] = "media_category LIKE '%_common_image%' "; 
 			$catArray[] = '_common_'.$type;
 		}
 		if($cat)
@@ -499,13 +496,8 @@ class e_media
 			{
 				$catArray[] = $cat; 
 			}
-	//		$inc[] = "media_category LIKE '%".$cat."%' "; // for multiple category field. 
-		//	$inc[] = "media_category REGEXP '(^|,)(".$cat.")(,|$)' "; // for multiple category field. 
 		}
-		
-		
-	//	$inc[] = "media_category REGEXP '(^|,)_common_image|banner_image(,|$)' ";
-		
+
 		// TODO check the category is valid. 
 		
 		if($search)
@@ -525,9 +517,6 @@ class e_media
 		$query = "SELECT ".$fields." FROM #core_media WHERE `media_category` REGEXP '(^|,)".implode("|",$catArray)."(,|$)' 
 		AND `media_userclass` IN (".USERCLASS_LIST.") 
 		AND `media_type` LIKE '".$type."/%' " ;
-	//	$query = "SELECT ".$fields." FROM #core_media WHERE media_userclass IN (".USERCLASS_LIST.") AND ( ".implode(" OR ",$inc)." ) " ;	
-
-
 
 		if($search)
 		{
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index 2ce178d57..520f2dc61 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -40,7 +40,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 
 			$(context).find('.e-media-select').once('media-manager-e-media-select').each(function ()
 			{
-				$(this).click(function ()
+				$(this).on('click', function ()
 				{
 					e107.mediaManager.eMediaSelect(this);
 				});