Updated drop-down logic