diff --git a/admin-dev/tabs/AdminModulesPositions.php b/admin-dev/tabs/AdminModulesPositions.php
index c98a5f5e7..5f0a3ffa4 100644
--- a/admin-dev/tabs/AdminModulesPositions.php
+++ b/admin-dev/tabs/AdminModulesPositions.php
@@ -126,7 +126,7 @@ class AdminModulesPositions extends AdminTab
 									$this->_errors[] = Tools::displayError('No valid value for field exceptions');
 	
 							// Add files exceptions
-							if (!$module->editExceptions($id_hook, $exception, array($id)))
+							if (!$module->editExceptions($id_hook, $exception, Shop::getListFromContext()))
 								$this->_errors[] = Tools::displayError('An error occurred while transplanting module to hook.');
 						}
 						
@@ -320,7 +320,6 @@ class AdminModulesPositions extends AdminTab
 						'.($instance->version ? ' v'.((int)($instance->version) == $instance->version? sprintf('%.1f', $instance->version) : (float)($instance->version)) : '').'<br />'.$instance->description.'
 					</label></td>
 						<td width="60">';
-					if ($canMove)
 						echo '
 							<a href="'.$currentIndex.'&id_module='.$instance->id.'&id_hook='.$hook['id_hook'].'&editGraft'.($this->displayKey ? '&show_modules='.$this->displayKey : '').'&token='.$this->token.'"><img src="../img/admin/edit.gif" border="0" alt="'.$this->l('Edit').'" title="'.$this->l('Edit').'" /></a>
 							<a href="'.$currentIndex.'&id_module='.$instance->id.'&id_hook='.$hook['id_hook'].'&deleteGraft'.($this->displayKey ? '&show_modules='.$this->displayKey : '').'&token='.$this->token.'"><img src="../img/admin/delete.gif" border="0" alt="'.$this->l('Delete').'" title="'.$this->l('Delete').'" /></a>
@@ -409,15 +408,44 @@ class AdminModulesPositions extends AdminTab
 					echo '
 					</select><sup> *</sup>
 				</div>';
+					
+		echo <<<EOF
+			<script type="text/javascript">
+			//<![CDATA
+			function position_exception_add(shopID)
+			{
+				var listValue = $('#em_list_'+shopID).val();
+				var inputValue = $('#em_text_'+shopID).val();
+				var r = new RegExp('(^|,) *'+listValue+' *(,|$)');
+				if (!r.test(inputValue))
+					$('#em_text_'+shopID).val(inputValue + ((inputValue.trim()) ? ', ' : '') + listValue);
+			}
+			
+			function position_exception_remove(shopID)
+			{
+				var listValue = $('#em_list_'+shopID).val();
+				var inputValue = $('#em_text_'+shopID).val();
+				var r = new RegExp('(^|,) *'+listValue+' *(,|$)');
+				if (r.test(inputValue))
+				{
+					var rep = '';
+					if (new RegExp(listValue+' *,').test(inputValue))
+						rep = ',';
+					$('#em_text_'+shopID).val(inputValue.replace(r, rep));
+				}
+			}
+			//]]>
+			</script>
+EOF;
 
 		// Manage exceptions
 		if (!$exceptsDiff)
 		{
 			echo '<label>'.$this->l('Exceptions').' :</label>
-					<div class="margin-form">
-						<input type="text" name="exceptions" size="40" '.(!empty($excepts) ? 'value="'.$excepts.'"' : '').'><br />Ex: identity.php, history.php, order.php, product.php<br /><br />
-						'.$this->l('Please specify those files for which you do not want the module to be displayed').'.<br />
-						'.$this->l('These files are located in your base directory').', '.$this->l('e.g., ').' <b>identity.php</b>.<br />
+					<div class="margin-form">';
+			$this->displayModuleExceptionList($excepts, 0);
+
+			echo $this->l('Please specify those files for which you do not want the module to be displayed').'.<br />
 						'.$this->l('Please type each filename separated by a comma').'.
 						<br /><br />
 					</div>';
@@ -428,13 +456,9 @@ class AdminModulesPositions extends AdminTab
 					<div class="margin-form">';
 			foreach ($exceptsList as $shopID => $fileList)
 			{
-				echo '<input type="text" name="exceptions['.$shopID.']" size="40" value="' . implode(', ', $fileList) . '">';
-				$shop = new Shop($shopID);
-				echo ' ('.htmlspecialchars($shop->name).')<br /><br />';
+				$this->displayModuleExceptionList($fileList, $shopID);
 			}
-			echo 'Ex: identity.php, history.php, order.php, product.php<br /><br />
-						'.$this->l('Please specify those files for which you do not want the module to be displayed').'.<br />
-						'.$this->l('These files are located in your base directory').', '.$this->l('e.g., ').' <b>identity.php</b>.<br />
+			echo $this->l('Please specify those files for which you do not want the module to be displayed').'.<br />
 						'.$this->l('Please type each filename separated by a comma').'.
 						<br /><br />
 					</div>';
@@ -456,4 +480,25 @@ class AdminModulesPositions extends AdminTab
 			</fieldset>
 		</form>';
 	}
+	
+	public function displayModuleExceptionList($fileList, $shopID)
+	{
+		if (!is_array($fileList))
+			$fileList = ($fileList) ? array($fileList) : array();
+
+		echo '<input type="text" name="exceptions['.$shopID.']" size="40" value="' . implode(', ', $fileList) . '" id="em_text_'.$shopID.'">';
+		if ($shopID)
+			echo ' ('.Shop::getInstance($shopID)->name.')';
+		echo '<br /><select id="em_list_'.$shopID.'">';
+		
+		// @todo do something better with controllers
+		Dispatcher::loadControllers();
+		ksort(Dispatcher::$controllers);
+		foreach (Dispatcher::$controllers as $k => $v)
+		{
+			echo '<option value="'.$k.'">'.$k.'</option>';
+		}
+		echo '</select> <input type="button" class="button" value="'.$this->l('Add').'" onclick="position_exception_add('.$shopID.')" /> 
+				<input type="button" class="button" value="'.$this->l('Remove').'" onclick="position_exception_remove('.$shopID.')" /><br /><br />';
+	}
 }
diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index d28ee9edd..bfc08ec77 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -2,7 +2,7 @@
 
 class DispatcherCore
 {
-	public $controllers;
+	public static $controllers = array();
 	public static $controller;
 
 	function __construct()
@@ -15,24 +15,24 @@ class DispatcherCore
 		self::$controller = $this->getController();
 
 		self::$controller = str_replace('-', '', strtolower(self::$controller));
-		if (!isset($this->controllers[self::$controller]))
+		if (!isset(self::$controllers[self::$controller]))
 			self::$controller = 'index';
-		ControllerFactory::getController($this->controllers[self::$controller])->run();
+		ControllerFactory::getController(self::$controllers[self::$controller])->run();
 	}
 
-	protected function loadControllers()
+	public static function loadControllers()
 	{
 		$controller_files = scandir(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'controllers');
-		foreach($controller_files as $controller_filename)
+		foreach ($controller_files as $controller_filename)
 		{
 			if (substr($controller_filename, -14, 14) == 'Controller.php')
-				$this->controllers[strtolower(substr($controller_filename, 0, -14))] = basename($controller_filename, '.php');
+				self::$controllers[strtolower(substr($controller_filename, 0, -14))] = basename($controller_filename, '.php');
 		}
 
 		// add default controller
-		$this->controllers['index'] = 'IndexController';
-		$this->controllers['authentication'] = $this->controllers['auth'];
-		$this->controllers['productscomparison'] = $this->controllers['compare'];
+		self::$controllers['index'] = 'IndexController';
+		self::$controllers['authentication'] = self::$controllers['auth'];
+		self::$controllers['productscomparison'] = self::$controllers['compare'];
 	}
 
 	public function getController()
diff --git a/classes/Module.php b/classes/Module.php
index 2c9010453..650cda2ed 100644
--- a/classes/Module.php
+++ b/classes/Module.php
@@ -783,9 +783,8 @@ abstract class ModuleCore
 				continue;
 
 			$exceptions = $moduleInstance->getExceptions($array['id_hook']);
-			foreach ($exceptions AS $exception)
-				if (strstr(basename($_SERVER['PHP_SELF']).'?'.$_SERVER['QUERY_STRING'], $exception))
-					continue 2;
+			if (in_array(Dispatcher::$controller, $exceptions))
+				continue;
 
 			if (is_callable(array($moduleInstance, 'hook'.$hook_name)))
 			{