diff --git a/console/src/components/Services/Data/TableCommon/TableReducer.js b/console/src/components/Services/Data/TableCommon/TableReducer.js
index 8b73f6a310231..7c28151e1ba27 100644
--- a/console/src/components/Services/Data/TableCommon/TableReducer.js
+++ b/console/src/components/Services/Data/TableCommon/TableReducer.js
@@ -157,14 +157,7 @@ const modifyReducer = (tableName, schemas, modifyStateOrig, action) => {
       return {
         ...modifyState,
         relAdd: {
-          isActive: true,
-          tableName: '',
-          name: '',
-          isObjRel: null,
-          lcol: [],
-          rTable: null,
-          rcol: [],
-          manualColumns: [],
+          ...defaultModifyState.relAdd,
         },
       };
     case REL_SET_TYPE:
diff --git a/console/src/components/Services/Data/TablePermissions/Permissions.js b/console/src/components/Services/Data/TablePermissions/Permissions.js
index 92cacf130807e..a23117f3b3698 100644
--- a/console/src/components/Services/Data/TablePermissions/Permissions.js
+++ b/console/src/components/Services/Data/TablePermissions/Permissions.js
@@ -765,164 +765,164 @@ class Permissions extends Component {
         const setOptions =
           insertState && insertState.localSet && insertState.localSet.length > 0
             ? insertState.localSet.map((s, i) => {
-                return (
-                  <div className={styles.insertSetConfigRow} key={i}>
-                    <div
-                      className={
-                        styles.display_inline +
+              return (
+                <div className={styles.insertSetConfigRow} key={i}>
+                  <div
+                    className={
+                      styles.display_inline +
                         ' ' +
                         styles.add_mar_right +
                         ' ' +
                         styles.input_element_wrapper
-                      }
+                    }
+                  >
+                    <select
+                      className="input-sm form-control"
+                      value={s.key}
+                      onChange={this.onSetKeyChange.bind(this)}
+                      data-index-id={i}
+                      disabled={disableInput}
                     >
-                      <select
-                        className="input-sm form-control"
-                        value={s.key}
-                        onChange={this.onSetKeyChange.bind(this)}
-                        data-index-id={i}
-                        disabled={disableInput}
-                      >
-                        <option value="" disabled>
+                      <option value="" disabled>
                           Column Name
-                        </option>
-                        {columns && columns.length > 0
-                          ? columns.map((c, key) => (
-                              <option
-                                value={c.column_name}
-                                data-column-type={c.data_type}
-                                key={key}
-                              >
-                                {c.column_name}
-                              </option>
-                            ))
-                          : null}
-                      </select>
-                    </div>
-                    <div
-                      className={
-                        styles.display_inline +
+                      </option>
+                      {columns && columns.length > 0
+                        ? columns.map((c, key) => (
+                          <option
+                            value={c.column_name}
+                            data-column-type={c.data_type}
+                            key={key}
+                          >
+                            {c.column_name}
+                          </option>
+                        ))
+                        : null}
+                    </select>
+                  </div>
+                  <div
+                    className={
+                      styles.display_inline +
                         ' ' +
                         styles.add_mar_right +
                         ' ' +
                         styles.input_element_wrapper
-                      }
+                    }
+                  >
+                    <select
+                      className="input-sm form-control"
+                      onChange={this.onSetTypeChange.bind(this)}
+                      data-index-id={i}
+                      value={setConfigValueType(s.value) || ''}
+                      disabled={disableInput}
                     >
-                      <select
-                        className="input-sm form-control"
-                        onChange={this.onSetTypeChange.bind(this)}
-                        data-index-id={i}
-                        value={setConfigValueType(s.value) || ''}
-                        disabled={disableInput}
-                      >
-                        <option value="" disabled>
+                      <option value="" disabled>
                           Select Preset Type
-                        </option>
-                        <option value="static">static</option>
-                        <option value="session">from session variable</option>
-                      </select>
-                    </div>
-                    <div
-                      className={
-                        styles.display_inline +
+                      </option>
+                      <option value="static">static</option>
+                      <option value="session">from session variable</option>
+                    </select>
+                  </div>
+                  <div
+                    className={
+                      styles.display_inline +
                         ' ' +
                         styles.add_mar_right +
                         ' ' +
                         styles.input_element_wrapper
-                      }
-                    >
-                      {setConfigValueType(s.value) === 'session' ? (
-                        <InputGroup>
-                          <InputGroup.Addon>X-Hasura-</InputGroup.Addon>
-                          <input
-                            className={'input-sm form-control '}
-                            placeholder="column_value"
-                            value={s.value.slice(X_HASURA_CONST.length)}
-                            onChange={this.onSetValueChange.bind(this)}
-                            onBlur={e => this.onSetValueBlur(e, i, null)}
-                            data-index-id={i}
-                            data-prefix-val={X_HASURA_CONST}
-                            disabled={disableInput}
-                          />
-                        </InputGroup>
-                      ) : (
-                        <EnhancedInput
+                    }
+                  >
+                    {setConfigValueType(s.value) === 'session' ? (
+                      <InputGroup>
+                        <InputGroup.Addon>X-Hasura-</InputGroup.Addon>
+                        <input
+                          className={'input-sm form-control '}
                           placeholder="column_value"
-                          type={
-                            i in this.state.insertSetOperations.columnTypeMap
-                              ? this.state.insertSetOperations.columnTypeMap[i]
-                              : ''
-                          }
-                          value={s.value}
+                          value={s.value.slice(X_HASURA_CONST.length)}
                           onChange={this.onSetValueChange.bind(this)}
-                          onBlur={this.onSetValueBlur}
-                          indexId={i}
+                          onBlur={e => this.onSetValueBlur(e, i, null)}
+                          data-index-id={i}
                           data-prefix-val={X_HASURA_CONST}
                           disabled={disableInput}
                         />
-                      )}
-                    </div>
-                    {setConfigValueType(s.value) === 'session' ? (
-                      <div
-                        className={
-                          styles.display_inline +
+                      </InputGroup>
+                    ) : (
+                      <EnhancedInput
+                        placeholder="column_value"
+                        type={
+                          i in this.state.insertSetOperations.columnTypeMap
+                            ? this.state.insertSetOperations.columnTypeMap[i]
+                            : ''
+                        }
+                        value={s.value}
+                        onChange={this.onSetValueChange.bind(this)}
+                        onBlur={this.onSetValueBlur}
+                        indexId={i}
+                        data-prefix-val={X_HASURA_CONST}
+                        disabled={disableInput}
+                      />
+                    )}
+                  </div>
+                  {setConfigValueType(s.value) === 'session' ? (
+                    <div
+                      className={
+                        styles.display_inline +
                           ' ' +
                           styles.add_mar_right +
                           ' ' +
                           styles.input_element_wrapper +
                           ' ' +
                           styles.e_g_text
-                        }
-                      >
+                      }
+                    >
                         e.g. X-Hasura-User-Id
-                      </div>
-                    ) : (
-                      <div
-                        className={
-                          styles.display_inline +
+                    </div>
+                  ) : (
+                    <div
+                      className={
+                        styles.display_inline +
                           ' ' +
                           styles.add_mar_right +
                           ' ' +
                           styles.input_element_wrapper +
                           ' ' +
                           styles.e_g_text
-                        }
-                      >
+                      }
+                    >
                         e.g. false, 1, some-text
-                      </div>
-                    )}
-                    {i !== insertState.localSet.length - 1 ? (
-                      <div
-                        className={
-                          styles.display_inline +
+                    </div>
+                  )}
+                  {i !== insertState.localSet.length - 1 ? (
+                    <div
+                      className={
+                        styles.display_inline +
                           ' ' +
                           styles.add_mar_right +
                           ' ' +
                           styles.input_element_wrapper
+                      }
+                    >
+                      <i
+                        className="fa-lg fa fa-times"
+                        onClick={
+                          !disableInput ? this.deleteSetKeyVal.bind(this) : ''
                         }
-                      >
-                        <i
-                          className="fa-lg fa fa-times"
-                          onClick={
-                            !disableInput ? this.deleteSetKeyVal.bind(this) : ''
-                          }
-                          data-index-id={i}
-                        />
-                      </div>
-                    ) : (
-                      <div
-                        className={
-                          styles.display_inline +
+                        data-index-id={i}
+                      />
+                    </div>
+                  ) : (
+                    <div
+                      className={
+                        styles.display_inline +
                           ' ' +
                           styles.add_mar_right +
                           ' ' +
                           styles.input_element_wrapper
-                        }
-                      />
-                    )}
-                  </div>
-                );
-              })
+                      }
+                    />
+                  )}
+                </div>
+              );
+            })
             : null;
 
         return (
diff --git a/console/src/components/Services/Data/TableRelationships/Actions.js b/console/src/components/Services/Data/TableRelationships/Actions.js
index c542136e8e8f6..57bcc568a94c6 100644
--- a/console/src/components/Services/Data/TableRelationships/Actions.js
+++ b/console/src/components/Services/Data/TableRelationships/Actions.js
@@ -189,7 +189,8 @@ const addRelNewFromStateMigrate = () => (dispatch, getState) => {
     state.lcol,
     state.rTable,
     state.rcol,
-    state.isObjRel
+    state.isObjRel,
+    currentSchema
   );
   const relChangesUp = [upQuery];
   const relChangesDown = [downQuery];
diff --git a/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js b/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js
index aa2ddda274115..0f5a53a37edb6 100644
--- a/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js
+++ b/console/src/components/Services/Data/TableRelationships/AddManualRelationship.js
@@ -151,7 +151,13 @@ class AddManualRelationship extends Component {
               className={'form-control'}
               onChange={this.onSchemaChange}
               data-test="remote-schema"
-              value={manualRelInfo.remoteSchema}
+              value={
+                manualRelInfo &&
+                'remoteSchema' in manualRelInfo &&
+                manualRelInfo.remoteSchema
+                  ? manualRelInfo.remoteSchema
+                  : ''
+              }
             >
               <option key="default_table">Remote Schema</option>
               {schemaList.map((s, i) => (
diff --git a/console/src/components/Services/Data/TableRelationships/Relationships.js b/console/src/components/Services/Data/TableRelationships/Relationships.js
index ef1311fbbfa8d..cc6c483589abe 100644
--- a/console/src/components/Services/Data/TableRelationships/Relationships.js
+++ b/console/src/components/Services/Data/TableRelationships/Relationships.js
@@ -221,18 +221,34 @@ const AddRelationship = ({
   // Finding the object from the suggestedRelationshipsArray which is currently selected
   if (cachedRelationshipData.isObjRel) {
     selectedRelationship = suggestedRelationshipsData.objectRel.find(rel => {
+      const cLcol =
+        typeof cachedRelationshipData.lcol === 'string'
+          ? [cachedRelationshipData.lcol]
+          : cachedRelationshipData.lcol;
+      const cRcol =
+        typeof cachedRelationshipData.rcol === 'string'
+          ? [cachedRelationshipData.rcol]
+          : cachedRelationshipData.rcol;
       return (
-        rel.lcol.join(',') === cachedRelationshipData.lcol.join(',') &&
-        rel.rcol.join(',') === cachedRelationshipData.rcol.join(',') &&
+        rel.lcol.join(',') === cLcol.join(',') &&
+        rel.rcol.join(',') === cRcol.join(',') &&
         rel.rTable === cachedRelationshipData.rTable &&
         rel.tableName === cachedRelationshipData.tableName
       );
     });
   } else {
     selectedRelationship = suggestedRelationshipsData.arrayRel.find(rel => {
+      const cLcol =
+        typeof cachedRelationshipData.lcol === 'string'
+          ? [cachedRelationshipData.lcol]
+          : cachedRelationshipData.lcol;
+      const cRcol =
+        typeof cachedRelationshipData.rcol === 'string'
+          ? [cachedRelationshipData.rcol]
+          : cachedRelationshipData.rcol;
       return (
-        rel.lcol.join(',') === cachedRelationshipData.lcol.join(',') &&
-        rel.rcol.join(',') === cachedRelationshipData.rcol.join(',') &&
+        rel.lcol.join(',') === cLcol.join(',') &&
+        rel.rcol.join(',') === cRcol.join(',') &&
         rel.rTable === cachedRelationshipData.rTable &&
         rel.tableName === cachedRelationshipData.tableName
       );
diff --git a/console/src/components/Services/Data/TableRelationships/autoRelations.js b/console/src/components/Services/Data/TableRelationships/autoRelations.js
index e17a26e915640..e2a60135e7d87 100644
--- a/console/src/components/Services/Data/TableRelationships/autoRelations.js
+++ b/console/src/components/Services/Data/TableRelationships/autoRelations.js
@@ -1,3 +1,13 @@
+const getTableName = t => {
+  const typ = typeof t;
+  if (typ === 'string') {
+    return t;
+  } else if (typ === 'object') {
+    return 'name' in t ? t.name : '';
+  }
+  return '';
+};
+
 const suggestedRelationshipsRaw = (tableName, allSchemas) => {
   const objRels = [];
   const arrRels = [];
@@ -75,7 +85,7 @@ const suggestedRelationshipsRaw = (tableName, allSchemas) => {
 
           if (
             currRCol.sort().join(',') === rcol.sort().join(',') &&
-            currTable === constraint.table_name
+            getTableName(currTable) === constraint.table_name
           ) {
             // existing relationship
             isExistingArrayRel = true;