diff --git a/Web/Masters/BaseMaster.master b/Web/Masters/BaseMaster.master
index 1ce983132..6b6b0ec7a 100644
--- a/Web/Masters/BaseMaster.master
+++ b/Web/Masters/BaseMaster.master
@@ -30,12 +30,27 @@
 
         foreach (var availibleLanguage in LanguageProvider.GetAvailibleLanguages())
         {
+            var key = availibleLanguage.Key;
+            if (key.Contains(".aspx"))
+            {
+                var newKey = key.Split(
+                    new[] { ".aspx" },
+                    StringSplitOptions.None
+                    );
+                key = newKey[0] + ".aspx";
+            }
+            var keyUrl = new Uri(availibleLanguage.Key);
+            if (keyUrl.Query != "")
+            {
+                key = key.Replace(keyUrl.Query, "");
+            }
+
             if (availibleLanguage.Value.Name == culture)
                 sb.Insert(0, string.Format(@"<link rel=""canonical"" href=""{0}"" />",
-                                           availibleLanguage.Key) + Environment.NewLine);
+                                           key) + Environment.NewLine);
             
             sb.AppendLine(string.Format(@"<link rel=""alternate"" href=""{0}"" hreflang=""{1}"" />",
-                                        availibleLanguage.Key.HtmlEncode(),
+                                        key.HtmlEncode(),
                                         availibleLanguage.Value.Name));
         }