Temporarily fixes #154 by wrapping each token that has a single quote in a pair of double quotes.  Not perfect as it alters the query slightly.