Moving fetching of related resources to separate method + fixing ordering