Change or statements to use true/false values rather than null