update citizen request form. change filed type from choice to entity
refactor code