Favorites issues fixed