diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl
index 33d9d4a85..3dc52162c 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl
@@ -121,7 +121,17 @@
                                 select="if (./@locale = $lang)
                                         then concat('language-selector-', ./@locale, ' selected')
                                         else concat('language-selector-', ./@locale)"/>
-                <xsl:with-param name="href" tunnel="yes" select="concat('?lang=', ./@locale)"/>
+                <!--<xsl:with-param name="href" tunnel="yes" select="concat('?lang=', ./@locale)"/>-->
+                <xsl:with-param name="href" tunnel="yes">
+                    <xsl:choose>
+                        <xsl:when test="substring($data-tree/@url, string-length($data-tree/@url) - 2, 1) = '.'">
+                            <xsl:value-of select="concat(substring($data-tree/@url, 0, string-length($data-tree/@url) - 1), ./@locale)" />
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="concat('?lang=', ./@locale)" />
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:with-param>
                 <xsl:with-param name="language-name"
                                 tunnel="yes"
                                 select="foundry:get-static-text('', concat('language/', ./@locale))"/>
diff --git a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java
index 74f250042..74422e124 100644
--- a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java
+++ b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java
@@ -145,7 +145,7 @@ public class SciProjectList extends AbstractComponent {
                                                 orderBy));
             projectsQueryStatement.setString(1, categoryId);
             projectsQueryStatement.setString(2, GlobalizationHelper
-                .getNegotiatedLocale().getLanguage());
+                .getNegotiatedLocale().getLanguage()); 
             projectsQueryStatement.setInt(3, limit);
 
             if (request.getParameter("page") == null) {