Refine selection update mechanism