adds label support
fixes field name