Fix 'and' and 'or' in queries
Add keyword queries