Fix more n plus 1 queries#1638

ChrisLovering wants to merge 2 commits into

mainpython-discord/site:mainfrom

fix-more-n-plus-1-queriespython-discord/site:fix-more-n-plus-1-queriesCopy head branch name to clipboard