AND and OR headers are now formatted properly