Now with highlighting of search results
Fix sorting select