Updated Forms custom select