Additional changes for Fix of the issue with login redirect on search page having spaces in query