VID-1993 Update selector from code review