diff --git a/api/base/filters.py b/api/base/filters.py
index 2aed314d198..30b9ea87a3d 100644
--- a/api/base/filters.py
+++ b/api/base/filters.py
@@ -292,7 +292,9 @@ def parse_query_params(self, query_params):
                             field_name: self._parse_date_param(field, source_field_name, op, value),
                         })
                     elif not isinstance(value, int) and source_field_name in ['_id', 'guid._id']:
-                        # TODO: this is broken since value can be a multi-value str separated by comma
+                        # TODO: this is broken since value can be a multi-value str separated by comma; in addition,
+                        #       as for a single-versioned-guid value, the filter is `or` but we need `and`; this will
+                        #       be fixed in [ENG-6878](https://openscience.atlassian.net/browse/ENG-6878).
                         base_guid, version = Guid.split_guid(value)
                         if base_guid is None and version is None:
                             raise InvalidFilterValue(
diff --git a/api/guids/views.py b/api/guids/views.py
index 90b09a3d5ea..de9171a0451 100644
--- a/api/guids/views.py
+++ b/api/guids/views.py
@@ -49,7 +49,7 @@ def get_serializer_class(self):
         return None
 
     def get_object(self):
-        base_guid_str, _ = Guid.split_guid(self.kwargs['guid'])
+        base_guid_str, _ = Guid.split_guid(self.kwargs['guids'])
         return get_object_or_error(
             Guid,
             base_guid_str,