diff --git a/e107_handlers/language_class.php b/e107_handlers/language_class.php
index 878516252..7a5171028 100644
--- a/e107_handlers/language_class.php
+++ b/e107_handlers/language_class.php
@@ -416,9 +416,12 @@ class language{
 		
       //  $urlval = str_replace($_SERVER['HTTP_HOST'],$codelnk.".".e_DOMAIN,e_SELF);
 		
-		$urlval = (e_QUERY)
-		        ? str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF).'?'.e_QUERY
-		        : str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF);
+		/*	$urlval = (e_QUERY)
+			        ? str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF).'?'.e_QUERY
+			        : str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_SELF);
+		*/
+
+		$urlval = str_replace($_SERVER['HTTP_HOST'], $codelnk.'.'.e_DOMAIN, e_REQUEST_URL) ;
 		
         return (string) $urlval;
 	}
diff --git a/e107_plugins/faqs/e_url.php b/e107_plugins/faqs/e_url.php
index 8aaaf03df..00aa8be20 100644
--- a/e107_plugins/faqs/e_url.php
+++ b/e107_plugins/faqs/e_url.php
@@ -34,7 +34,7 @@ class faqs_url // plugin-folder + '_url'
 		);
 
 		$config['item'] = array(
-			'regex'			=> '^faqs/(\d*)-(.*)$$',
+			'regex'			=> '^faqs/(\d*)-(.*)$',
 			'sef'			=> 'faqs/{faq_id}-{faq_sef}',			// {faq_info_sef} is substituted with database value when parsed by e107::url();
 			'redirect'		=> '{e_PLUGIN}faqs/faqs.php?id=$1'
 		);