Solved conflict sort_by for favorites and popularity