code polish

nts: can’t compare entities directly, must choose value