Major changes to search and BookList