Fixed bug with query addition and subtraction expressions