Add drop selection, fix a bug with automatic renames