Adds support for spaces in query