Add choices validation to upload validator
Fix template