Instead of exposing the raw value of the option which is the id of the entity, we should resolve the entity and expose that.