fix parsing so that is accept big And, big Or