diff --git a/apps/journeys/views.py b/apps/journeys/views.py
index c3fe2e4..25a4923 100644
--- a/apps/journeys/views.py
+++ b/apps/journeys/views.py
@@ -69,6 +69,7 @@ class PatientJourneyStageTemplateViewSet(viewsets.ModelViewSet):
     """
     queryset = PatientJourneyStageTemplate.objects.all()
     serializer_class = PatientJourneyStageTemplateSerializer
+    filter_backends = []  # disable django-filter auto-generation (serializer has computed fields)
     permission_classes = [IsAuthenticated, IsPXAdminOrHospitalAdmin]
     filterset_fields = ['journey_template', 'is_active', 'auto_send_survey']
     search_fields = ['name', 'name_ar', 'code', 'trigger_event_code']
@@ -208,8 +209,11 @@ class PatientJourneyStageInstanceViewSet(viewsets.ReadOnlyModelViewSet):
     Stage instances are created automatically and updated via event processing.
     Manual updates should be done through the admin interface.
     """
-    queryset = PatientJourneyStageInstance.objects.all()
+    queryset = PatientJourneyStageInstance.objects.select_related(
+        "journey_instance", "stage_template", "staff", "department"
+    )
     serializer_class = PatientJourneyStageInstanceSerializer
+    filter_backends = []  # disable django-filter auto-generation (serializer has computed fields)
     permission_classes = [IsAuthenticated]
     filterset_fields = ['journey_instance', 'stage_template', 'status']
     search_fields = ['journey_instance__encounter_id', 'stage_template__name']
diff --git a/apps/organizations/serializers.py b/apps/organizations/serializers.py
index e02c61e..8cedbd0 100644
--- a/apps/organizations/serializers.py
+++ b/apps/organizations/serializers.py
@@ -37,10 +37,8 @@ class OrganizationSerializer(serializers.ModelSerializer):
             "city",
             "phone",
             "email",
-            "website",
+            "preferred_language",
             "status",
-            "license_number",
-            "logo",
             "hospitals_count",
             "created_at",
             "updated_at",