Refactor code just return only term id, front-end should map this id to right label for this term