Some fixes to the selection dropdown