diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index dc0188fe0..90a0416ac 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -336,7 +336,7 @@ class DispatcherCore
 
 			if (!array_key_exists($key, $params))
 				die("Dispatcher::createUrl() miss required parameter '$key' for route '$routeID'");
-			$queryParams[$key] = $params[$key];
+			$queryParams[$this->defaultRoutes[$routeID]['keywords'][$key]['param']] = $params[$key];
 		}
 
 		// Build an url which match a route
diff --git a/install-dev/xml/createDB.php b/install-dev/xml/createDB.php
index f2c33c209..6ba81af57 100644
--- a/install-dev/xml/createDB.php
+++ b/install-dev/xml/createDB.php
@@ -72,7 +72,6 @@ $datas = array(
 	array('_DB_PASSWD_', trim($_GET['password'])),
 	array('_DB_PREFIX_', trim($_GET['tablePrefix'])),
 	array('_MYSQL_ENGINE_', $_GET['engine']),
-	array('_PS_DIRECTORY_', $_PS_DIRECTORY_),
 	array('_PS_CACHING_SYSTEM_', 'MCached'),
 	array('_PS_CACHE_ENABLED_', '0'),
 	array('_MEDIA_SERVER_1_', ''),
@@ -182,7 +181,7 @@ switch (_DB_TYPE_) {
 				die('<action result="fail" error="9" />'."\n");
 			}
 		}
-		$db_data_settings .= "\n".'INSERT INTO `PREFIX_shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`,  `active`) VALUES(1, \''.pSQL(Tools::getHttpHost()).'\', \''.pSQL(Tools::getHttpHost()).'\', \'\', \'\', 1, 1);';
+		$db_data_settings .= "\n".'INSERT INTO `PREFIX_shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`,  `active`) VALUES(1, \''.pSQL(Tools::getHttpHost()).'\', \''.pSQL(Tools::getHttpHost()).'\', \''.pSQL('/'.trim($_PS_DIRECTORY_, '/')).'\', \'\', 1, 1);';
 		$db_data_settings .= "\n".'UPDATE `PREFIX_customer` SET `passwd` = \''.md5(_COOKIE_KEY_.'123456789').'\' WHERE `id_customer` =1;';
 		$db_data_settings .= "\n".'INSERT INTO `PREFIX_configuration` (name, value, date_add, date_upd) VALUES (\'PS_VERSION_DB\', \'' . INSTALL_VERSION . '\', NOW(), NOW());';
 		$db_data_settings = str_replace(array($filePrefix, $engineType), array($_GET['tablePrefix'], $_GET['engine']), $db_data_settings);