diff --git a/e107_handlers/language_class.php b/e107_handlers/language_class.php
index 7a5171028..ddce91c75 100644
--- a/e107_handlers/language_class.php
+++ b/e107_handlers/language_class.php
@@ -404,10 +404,13 @@ class language{
 	 * @param string $language eg. 'Spanish'
 	 * @return URL
 	 */
-	function subdomainUrl($language)
+	function subdomainUrl($language, $url=e_REQUEST_URL)
 	{
 		global $pref;
-		$codelnk = ($language == $pref['sitelanguage']) ? "www" : $this->convert($language);
+
+		$iso = (strlen($language) == 2) ? $language : $this->convert($language);
+
+		$codelnk = ($language == $pref['sitelanguage']) ? "www" : $iso;
 		
 		if($codelnk == '')
 		{
@@ -421,7 +424,10 @@ class language{
 			        : str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF);
 		*/
 
-		$urlval = str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_REQUEST_URL) ;
+
+		$domain = deftrue('e_DOMAIN','example.com');
+
+		$urlval = str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.$domain, $url) ;
 		
         return (string) $urlval;
 	}
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 85895e24d..72f5ef28b 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -936,15 +936,15 @@ class e107plugin
 					$linkData = array(
 						'link_name'			 => $link_name,
 						'link_url'			 => $path,
-						'link_description'	 => '',
-						'link_button'		 => '',
+						'link_description'	 => vartrue($options['link_desription'],''),
+						'link_button'		 => vartrue($options['link_icon'],''),
 						'link_category'		 => '1',
 						'link_order'		 => $link_t + 1,
 						'link_parent'		 => '0',
 						'link_open'			 => '0',
 						'link_class'		 => vartrue($linkclass,'0'),
 						'link_function'		 => (vartrue($options['link_function']) ? $this->plugFolder ."::".$options['link_function'] : ""),
-						'link_sefurl'			 => vartrue($options['link_sef']),
+						'link_sefurl'		 => vartrue($options['link_sef']),
 						'link_owner'		 => vartrue($options['link_owner'])
 					);
 					return $sql->insert('links', $linkData); 
@@ -1981,7 +1981,7 @@ class e107plugin
 		foreach ($array['link'] as $link)
 		{
 			$attrib 	= $link['@attributes'];
-			$linkName 	= (defset($link['@value'])) ? constant($link['@value']) : $link['@value'];
+			$linkName 	= (defset($link['@value'])) ? constant($link['@value']) : vartrue($link['@value'],'');
 			$remove 	= (varset($attrib['deprecate']) == 'true') ? TRUE : FALSE;
 			$url 		= vartrue($attrib['url']);
 			$perm 		= vartrue($attrib['perm'],'everyone'); 
@@ -1990,7 +1990,9 @@ class e107plugin
 			$options 	= array(
 				'link_function'	=>	vartrue($attrib['function']),
 				'link_owner'	=> 	vartrue($plug_vars['folder']),
-				'link_sef'		=> $sef
+				'link_sef'		=> $sef,
+				'link_icon'     => vartrue($attrib['icon']),
+				'link_description'  => vartrue($attrib['description'])
 			);
 
 			switch ($function)
diff --git a/e107_plugins/faqs/plugin.xml b/e107_plugins/faqs/plugin.xml
index ab1751eef..93bac6b30 100644
--- a/e107_plugins/faqs/plugin.xml
+++ b/e107_plugins/faqs/plugin.xml
@@ -15,7 +15,7 @@
 		<link url="admin_config.php" description="Configure FAQs" icon="images/icon_32.png" iconSmall="images/icon_16.png" primary="true" >LAN_PLUGIN_FAQS_NAME</link>		
 	</adminLinks>
 	<siteLinks>
-		<link url="{e_PLUGIN}faqs/faqs.php" sef='index' description="FAQs" icon="images/icon_32.png" iconSmall="images/icon_16.png" >LAN_PLUGIN_FAQS_NAME</link>
+		<link url="{e_PLUGIN}faqs/faqs.php" sef='index' description="FAQs" perm='everyone' icon="" >LAN_PLUGIN_FAQS_NAME</link>
 	</siteLinks>
 	<pluginPrefs>
 		<pref name="add_faq">255</pref>