Fetch ranking improved