Updated Search function

Updated search to work with a wider range of search terms and now query
the database to filter results