fixed previous merge
[Form] Implemented attributes for choices