Remove "and" and "or" from Lucene query

Avoids a parse error from Lucene.
Update to version v787