Fixed favoriting issue