Add new feature: mark selected choice