Refine Performer selection, reduce edge case conflicts