Only apply special dropdown conversion to appropriate elements and to not generally do it.
Merge pull request #1444 from cmfcmf/dropdown-fix

Only apply special dropdown conversion to appropriate elements and do not generally do it.