added proper MakeOr() handling of commas