Fixes in the selection dropdown logic.