Melanie/Ashwin | #3007 | Updating choices on keyup event.