Changed ingredient flagging, contains/may_contain format