Fixes #4: Query string lost on default language