revert back to lucene for query building, fixes bad escapes