LP#1554714: more drop-down fixes