add in explicit ands and ors