diff --git a/met-api/src/met_api/models/comment.py b/met-api/src/met_api/models/comment.py
index 71ed17de9..a3d0339eb 100644
--- a/met-api/src/met_api/models/comment.py
+++ b/met-api/src/met_api/models/comment.py
@@ -134,13 +134,12 @@ def get_by_survey_id_paginated(
         """Get submissions by survey id paginated."""
         null_value = None
         query = db.session.query(Submission)\
-            .join(Comment, Submission.id == Comment.submission_id)\
             .filter(and_(Submission.survey_id == survey_id,
-                         or_(Submission.reviewed_by != 'System', Submission.reviewed_by == null_value)))\
+                         or_(Submission.reviewed_by != 'System', Submission.reviewed_by == null_value)))
 
         if search_text:
             # Remove all non-digit characters from search text
-            query = query.filter(Comment.text.ilike('%' + search_text + '%'))
+            query = query.filter(Submission.comments.any(Comment.text.ilike('%' + search_text + '%')))
 
         if advanced_search_filters:
             query = cls._filter_by_advanced_filters(query, advanced_search_filters)
diff --git a/met-api/src/met_api/models/engagement_slug.py b/met-api/src/met_api/models/engagement_slug.py
index ca32e5332..24ae897a1 100644
--- a/met-api/src/met_api/models/engagement_slug.py
+++ b/met-api/src/met_api/models/engagement_slug.py
@@ -26,7 +26,7 @@ class EngagementSlug(BaseModel):
     @classmethod
     def find_by_slug(cls, slug):
         """Return engagement slug by slug."""
-        return cls.query.filter_by(slug=slug).first()
+        return cls.query.filter(cls.slug.ilike(slug)).first()
 
     @classmethod
     def find_by_engagement_id(cls, engagement_id):