Now seems to parse boolean search expressions properly