fetch_related improvements