diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs
index 50464e265..88e0409ac 100644
--- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs
@@ -41,16 +41,13 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors
                 result = new CompareFilter<ClrValue>(path, nodeIn.Operator, nodeIn.Value);
             }
 
-            if (path.Count == 1 && path[0] == "_id")
+            if (value is List<Guid> guidList)
             {
-                if (result.Value.Value is List<Guid> guidList)
-                {
-                    result = new CompareFilter<ClrValue>(path, nodeIn.Operator, guidList.Select(x => x.ToString()).ToList());
-                }
-                else if (result.Value.Value is Guid guid)
-                {
-                    result = new CompareFilter<ClrValue>(path, nodeIn.Operator, guid.ToString());
-                }
+                result = new CompareFilter<ClrValue>(path, nodeIn.Operator, guidList.Select(x => x.ToString()).ToList());
+            }
+            else if (value is Guid guid)
+            {
+                result = new CompareFilter<ClrValue>(path, nodeIn.Operator, guid.ToString());
             }
 
             return result;
diff --git a/frontend/app/shared/components/references-dropdown.component.ts b/frontend/app/shared/components/references-dropdown.component.ts
index eddd86b8f..622f88b56 100644
--- a/frontend/app/shared/components/references-dropdown.component.ts
+++ b/frontend/app/shared/components/references-dropdown.component.ts
@@ -143,7 +143,7 @@ export class ReferencesDropdownComponent extends StatefulControlComponent<State,
             this.selectedId = obj;
 
             this.selectContent();
-        } if (Types.isArrayOfString(obj)) {
+        } else if (Types.isArrayOfString(obj)) {
             this.selectedId = obj[0];
 
             this.selectContent();