Add new feature: mark choice selected