diff --git a/src/dataStructure/relationMap.zig b/src/dataStructure/relationMap.zig
index 46dc2e2..c7381c9 100644
--- a/src/dataStructure/relationMap.zig
+++ b/src/dataStructure/relationMap.zig
@@ -45,7 +45,7 @@ pub fn populate(self: *RelationMap, input: []const u8) ZipponError!void {
 
         const member_end = if (input[pattern_start - 4] == '[') pattern_start - 6 else pattern_start - 5; // This should be ": {<|"
         var member_start = member_end - 1;
-        while (input[member_start] != ' ') : (member_start -= 1) {}
+        while (input[member_start] != ' ' and input[member_start] != '[' and input[member_start] != '{') : (member_start -= 1) {}
         member_start += 1;
 
         if (!std.mem.eql(u8, input[member_start..member_end], self.member_name)) continue;
diff --git a/src/ziql/parts/value.zig b/src/ziql/parts/value.zig
index 65b6b28..9f4f674 100644
--- a/src/ziql/parts/value.zig
+++ b/src/ziql/parts/value.zig
@@ -82,7 +82,7 @@ pub fn parseConditionValue(
                 token.loc.end,
             );
         } else {
-            return ConditionValue.initStr(self.toker.buffer[start_index..token.loc.end]);
+            return ConditionValue.initStr(self.toker.buffer[start_index + 1 .. token.loc.end - 1]); // Removing ''
         },
 
         .bool => if (token.tag != .bool_literal_true and token.tag != .bool_literal_false) {