No need to tokenize query

Workaround for #1