minor changes, treat boolean queries as keyword queries