Improved search functionality and ordered results alphabetically