Issue #2689607 by morenstrat, Ante890: Language from URL negotiator does not add request query to language switcher links