Handle spaces in query params