UIFormSelect fixes