Fixes for drop-down