change - improved query reformat of AND and OR has been removed