Adding a better error message
Adding a quick search to the search field