select & drop fixes