diff --git a/e107_core/shortcodes/single/imageselector.sc b/e107_core/shortcodes/single/imageselector.sc
index 013e3811e..e9ad91e20 100644
--- a/e107_core/shortcodes/single/imageselector.sc
+++ b/e107_core/shortcodes/single/imageselector.sc
@@ -15,7 +15,7 @@ else
 
 $paths = explode("|",$path);
 
-if(trim($default[0])=="{")
+if(trim($default{0})=="{")
 {
 	$pvw_default = $tp->replaceConstants($default, 'abs');
 	$path = ""; // remove the default path if a constant is used.
@@ -37,7 +37,7 @@ if($scaction == 'select' || $scaction == 'all')
 
 	foreach($paths as $pths)
 	{
-		$imagelist[$tp->createConstants($pths, 1)]= $fl->get_files($pths,'\.jpg|\.gif|\.png|\.JPG|\.GIF|\.PNG', 'standard', $recurse);
+		$imagelist[$tp->createConstants($pths, 'mix')]= $fl->get_files($pths,'\.jpg|\.gif|\.png|\.JPG|\.GIF|\.PNG', 'standard', $recurse);
 	}
 
 
@@ -74,7 +74,7 @@ if($scaction == 'select' || $scaction == 'all')
 				if(!$filter || ($filter && ereg($filter,$dir.$icon['fname'])))
 				{
 
-					$pth = ($fullpath) ? $tp->createConstants($icon['path'],1) : $dir;
+					$pth = ($fullpath) ? $tp->createConstants($icon['path'],'rel') : $dir;
 					$selected = ($default == $pth.$icon['fname'] || $pth.$default == $pth.$icon['fname']) ? " selected='selected'" : "";
 					$text .= "<option value='{$pth}{$icon['fname']}'{$selected}>&nbsp;&nbsp;&nbsp;{$dir}{$icon['fname']}</option>\n";
 				}
@@ -108,7 +108,7 @@ if(!$pvw_default)
 			$pvw_default = $tp->replaceConstants($pvw_default, 'abs');
 		}
 	}
-	else 
+	else
 	{
 		$pvw_default = e_IMAGE_ABS."generic/blank.gif";
 		$hide = ' style="display: none;"';
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index d4cd8ef2e..7549d8a1a 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -1777,7 +1777,8 @@ class e_parse
 					'{e_THEME}'		=> $e107->getFolder('themes'),
 					'{e_DOWNLOAD}'	=> $e107->getFolder('downloads'),
 					'{e_ADMIN}'		=> $e107->getFolder('admin'),
-					'{e_HANDLER}'	=> $e107->getFolder('handlers')
+					'{e_HANDLER}'	=> $e107->getFolder('handlers'),
+					'{e_MEDIA}'		=> $e107->getFolder('media'),
 					);
 			break;
 
@@ -1789,7 +1790,8 @@ class e_parse
 					'{e_THEME}'		=> e_THEME,
 					'{e_DOWNLOAD}'	=> e_DOWNLOAD,
 					'{e_ADMIN}'		=> e_ADMIN,
-					'{e_HANDLER}'	=> e_HANDLER
+					'{e_HANDLER}'	=> e_HANDLER,
+					'{e_MEDIA}'		=> e_MEDIA,
 				);
 			break;
 
@@ -1801,7 +1803,8 @@ class e_parse
 					'{e_THEME}'		=> e_THEME_ABS,
 					'{e_DOWNLOAD}'	=> e_BASE.'request.php?',
 					'{e_ADMIN}'		=> e_ADMIN_ABS,
-					'{e_HANDLER}'	=> e_HANDLER_ABS
+					'{e_HANDLER}'	=> e_HANDLER_ABS,
+					'{e_MEDIA}'		=> e_MEDIA_ABS,
 				);
 			break;
 
@@ -1813,7 +1816,8 @@ class e_parse
 					'{e_THEME}'		=> SITEURL.$e107->getFolder('themes'),
 					'{e_DOWNLOAD}'	=> SITEURL.$e107->getFolder('downloads'),
 					'{e_ADMIN}'		=> SITEURL.$e107->getFolder('admin'),
-					'{e_HANDLER}'	=> SITEURL.$e107->getFolder('handlers')
+					'{e_HANDLER}'	=> SITEURL.$e107->getFolder('handlers'),
+					'{e_MEDIA}'		=> SITEURL.$e107->getFolder('media'),
 				);
 			break;