diff --git a/apps/journeys/views.py b/apps/journeys/views.py
index 25a4923..02921b7 100644
--- a/apps/journeys/views.py
+++ b/apps/journeys/views.py
@@ -225,9 +225,8 @@ class PatientJourneyStageInstanceViewSet(viewsets.ReadOnlyModelViewSet):
         queryset = super().get_queryset().select_related(
             'journey_instance',
             'stage_template',
-            'physician',
+            'staff',
             'department',
-            'survey_instance'
         )
 
         user = self.request.user
diff --git a/apps/standards/views.py b/apps/standards/views.py
index 3d102d5..bee8158 100644
--- a/apps/standards/views.py
+++ b/apps/standards/views.py
@@ -113,7 +113,7 @@ class StandardAttachmentViewSet(viewsets.ModelViewSet):
     queryset = StandardAttachment.objects.all()
     filterset_fields = ["compliance"]
     search_fields = ["filename", "description"]
-    ordering = ["-uploaded_at"]
+    ordering = ["-created_at"]
 
     def get_serializer_class(self):
         from apps.standards.serializers import StandardAttachmentSerializer
@@ -126,7 +126,7 @@ class StandardAttachmentViewSet(viewsets.ModelViewSet):
         if user.is_px_admin():
             return queryset
         if user.hospital:
-            return queryset.filter(departments__hospital=user.hospital)
+            return queryset.filter(compliance__department__hospital=user.hospital)
         return queryset.none()