support number field
remove wrong "s"
fix value setting for all types