Fixed issue where highlighted choices where not clearing properly.