Fixed recognizing community choice options (highlighting not done yet)