Moving per-filter ordering to a third option instead of its own thing