Fixed search and fav functionality