WP-3862 Handling for the currently selected, removing clone selects, etc