Removed ugly code and fixed bugs.
Updated createSearchChoice; now understands e-mail addresses (but do we want that RFC5322 regex there?