Fetch Ranking improvement