fixes to custom select