Bug fixes to search and favourites