Support whitespace characters in query