diff --git a/src/containers/SearchEngine/components/QueryBuilder/Group.js b/src/containers/SearchEngine/components/QueryBuilder/Group.js
index 42ce5cc2fa..1a6db6d4ec 100644
--- a/src/containers/SearchEngine/components/QueryBuilder/Group.js
+++ b/src/containers/SearchEngine/components/QueryBuilder/Group.js
@@ -65,7 +65,7 @@ class Group extends PureComponent {
       return (
         <Rule
           key={`criteria-${index.toString()}`}
-          id={index}
+          id={[index]}
           type="criteria"
           changeRule={this.props.changeRule}
           fieldList={this.props.fieldList}
@@ -77,7 +77,7 @@ class Group extends PureComponent {
     return (
       <Rule
         key={`metacriteria-${index.toString()}`}
-        id={index}
+        id={[index]}
         type="metacriteria"
         changeRule={this.props.changeRule}
         {...rule}
diff --git a/src/containers/SearchEngine/components/QueryBuilder/Rule.js b/src/containers/SearchEngine/components/QueryBuilder/Rule.js
index 7e703009cf..1d8439a56e 100644
--- a/src/containers/SearchEngine/components/QueryBuilder/Rule.js
+++ b/src/containers/SearchEngine/components/QueryBuilder/Rule.js
@@ -182,7 +182,7 @@ Rule.defaultProps = {
 }
 
 Rule.propTypes = {
-  id: PropTypes.number.isRequired,
+  id: PropTypes.array.isRequired,
   itemtype: PropTypes.string,
   field: PropTypes.string,
   fieldList: PropTypes.array,
diff --git a/src/containers/SearchEngine/components/QueryBuilder/SubGroup.js b/src/containers/SearchEngine/components/QueryBuilder/SubGroup.js
index 49a0d4fe0c..b36c72b648 100644
--- a/src/containers/SearchEngine/components/QueryBuilder/SubGroup.js
+++ b/src/containers/SearchEngine/components/QueryBuilder/SubGroup.js
@@ -64,21 +64,32 @@ class SubGroup extends PureComponent {
 
   render() {
     const render = []
-    const { index } = this.props
     const rules = SubGroup.getRules(this.props.rule)
 
-    rules.forEach((rule) => {
+    rules.forEach((rule, index) => {
       if (!rule.criteria && !rule.metacriteria) {
         if (!rule.itemtype) {
-          render.push(this.selectRule('criteria', rule, index))
+          render.push(
+            this.selectRule(
+              'criteria',
+              rule,
+              [...this.props.index, 'criteria', index],
+            ),
+          )
         } else {
-          render.push(this.selectRule('metacriteria', rule, index))
+          render.push(
+            this.selectRule(
+              'metacriteria',
+              rule,
+              [...this.props.index, 'metacriteria', index],
+            ),
+          )
         }
       } else {
         render.push(
           <SubGroup
             key={`group-${index.toString()}`}
-            index={[index]}
+            index={[...this.props.index, index]}
             rule={rule}
             changeRule={this.props.changeRule}
             fieldList={this.props.fieldList}
diff --git a/src/containers/SearchEngine/components/QueryBuilder/index.js b/src/containers/SearchEngine/components/QueryBuilder/index.js
index 99db54dbac..2734bc0a5e 100644
--- a/src/containers/SearchEngine/components/QueryBuilder/index.js
+++ b/src/containers/SearchEngine/components/QueryBuilder/index.js
@@ -99,6 +99,18 @@ class QueryBuilder extends PureComponent {
               searchtype: 'contains',
               value: '',
             },
+            {
+              link: 'AND',
+              field: fieldList[0].value,
+              searchtype: 'contains',
+              value: 'test',
+            },
+            {
+              link: 'AND',
+              field: fieldList[0].value,
+              searchtype: 'contains',
+              value: '',
+            },
           ],
         },
       ],
@@ -135,19 +147,38 @@ class QueryBuilder extends PureComponent {
    */
   changeRule = (type, id, newValue) => {
     const CurrentRules = this.state[type]
-    const newRules = [...CurrentRules]
-
-    if (newValue) {
-      newRules[id] = { ...newRules[id], ...newValue }
-
-      this.setState({
-        [type]: newRules,
-      })
-    } else {
-      this.setState({
-        [type]: newRules.slice(0, id).concat(newRules.slice(id + 1)),
-      })
-    }
+    let newRules = [...CurrentRules]
+
+    console.log(id)
+
+    let rule = [...CurrentRules]
+    id.forEach((index) => {
+      rule = rule[index]
+    })
+
+    let y
+    id.forEach((index) => {
+      if (y) {
+        newRules = { ...newRules[index] }
+      }
+      y = index
+    })
+
+    console.log(rule)
+    console.log(newRules)
+
+
+    // if (newValue) {
+    //   newRules[id] = { ...newRules[id], ...newValue }
+
+    //   this.setState({
+    //     [type]: newRules,
+    //   })
+    // } else {
+    //   this.setState({
+    //     [type]: newRules.slice(0, id).concat(newRules.slice(id + 1)),
+    //   })
+    // }
   }
 
   /**