Fixed a empty number fields, added closure support on select options