fix binning mode ordering (no more wildcards)
binning cleanup