handle AND/OR correctly in Expression Parsing