Change search field label.
Reorder code.
Refactor to remove duplicate code.
Fix search result selection.