fix bug #1002371 - don't lose the query parameters when switching languages.
Merge pull request #2386 from jezdez/language-switcher

fix bug #1002371 - don't lose the query parameters when switching languages.