[BUG #8434] removed duplicate selection handling logic