Fix NullPointerException in clearChoices. Fixes #417

Also removed need to press clear twice after searching.