diff --git a/components/collections/EditFolder.vue b/components/collections/EditFolder.vue
index 44fd6b909..578d67ff1 100644
--- a/components/collections/EditFolder.vue
+++ b/components/collections/EditFolder.vue
@@ -12,13 +12,7 @@
     </div>
     <div slot="body" class="flex flex-col">
       <label for="selectLabel">{{ $t("label") }}</label>
-      <input
-        type="text"
-        id="selectLabel"
-        v-model="name"
-        :placeholder="folder.name"
-        @keyup.enter="editFolder"
-      />
+      <input type="text" id="selectLabel" v-model="name" @keyup.enter="editFolder" />
     </div>
     <div slot="footer">
       <div class="row-wrapper">
diff --git a/components/collections/ImportExport.vue b/components/collections/ImportExport.vue
index cf82c345d..bebe988e7 100644
--- a/components/collections/ImportExport.vue
+++ b/components/collections/ImportExport.vue
@@ -2,13 +2,13 @@
   <SmartModal v-if="show" @close="hideModal">
     <div slot="header">
       <div class="row-wrapper">
-        <h3 class="title">{{ $t(mode) }}</h3>
+        <h3 class="title">Export</h3>
         <div>
           <button
             class="tooltip-target icon"
             v-if="mode != 'import_export'"
             @click="mode = 'import_export'"
-            v-tooltip.left="$t('back')"
+            v-tooltip.left="'Back'"
           >
             <i class="material-icons">arrow_left</i>
           </button>
@@ -152,7 +152,7 @@
       <div v-if="mode == 'export_as_json'">
         <textarea v-model="collectionJson" rows="8" readonly></textarea>
         <div class="row-wrapper">
-          <span>
+          <span class="m-2">
             <button class="icon primary" @click="exportJSON" v-tooltip="$t('download_file')">
               {{ $t("export") }}
             </button>
@@ -287,7 +287,10 @@ export default {
               this.failedImport()
             })
         } else {
-          this.$store.commit("postwoman/replaceCollections", collections)
+          this.$store.commit("postwoman/replaceCollections", {
+            data: collections,
+            flag: "rest",
+          })
           this.fileImported()
           this.syncToFBCollections()
         }
@@ -329,7 +332,7 @@ export default {
               this.failedImport()
             })
         } else {
-          this.$store.commit("postwoman/importCollections", collections)
+          this.$store.commit("postwoman/importCollections", { data: collections, flag: "rest" })
           this.syncToFBCollections()
           this.fileImported()
         }
diff --git a/components/collections/my/Collection.vue b/components/collections/my/Collection.vue
index 4b0079638..72e3c9da0 100644
--- a/components/collections/my/Collection.vue
+++ b/components/collections/my/Collection.vue
@@ -13,7 +13,7 @@
         <i class="material-icons" v-show="!showChildren && !isFiltered">arrow_right</i>
         <i class="material-icons" v-show="showChildren || isFiltered">arrow_drop_down</i>
 
-        <i v-if="isSelected" class="text-green-400 material-icons"> check_circle </i>
+        <i v-if="isSelected" class="text-green-400 material-icons">check_circle</i>
 
         <i v-else class="material-icons">folder</i>
         <span>{{ collection.name }}</span>
diff --git a/components/collections/my/Folder.vue b/components/collections/my/Folder.vue
index c2505c3a9..4c1c0e1be 100644
--- a/components/collections/my/Folder.vue
+++ b/components/collections/my/Folder.vue
@@ -67,6 +67,7 @@
             :saveRequest="saveRequest"
             :collectionsType="collectionsType"
             :folder-path="`${folderPath}/${subFolderIndex}`"
+            :picked="picked"
             @add-folder="$emit('add-folder', $event)"
             @edit-folder="$emit('edit-folder', $event)"
             @edit-request="$emit('edit-request', $event)"
diff --git a/components/collections/my/Request.vue b/components/collections/my/Request.vue
index 2c85a04d8..c29de89d0 100644
--- a/components/collections/my/Request.vue
+++ b/components/collections/my/Request.vue
@@ -14,10 +14,9 @@
           @click="!doc ? selectRequest() : {}"
           v-tooltip="!doc ? $t('use_request') : ''"
         >
-          <span :class="getRequestLabelColor(request.method)">{{ request.method }}</span>
-
-          <i v-if="isSelected" class="material-icons"> check </i>
+          <i v-if="isSelected" class="text-green-400 material-icons">check_circle</i>
 
+          <span v-else :class="getRequestLabelColor(request.method)">{{ request.method }}</span>
           <span>{{ request.name }}</span>
         </button>
       </div>
diff --git a/components/collections/teams/Folder.vue b/components/collections/teams/Folder.vue
index 20ef44109..237255f64 100644
--- a/components/collections/teams/Folder.vue
+++ b/components/collections/teams/Folder.vue
@@ -126,6 +126,8 @@
 </template>
 
 <script>
+import * as team_utils from "~/helpers/teams/utils"
+
 export default {
   name: "folder",
   props: {
diff --git a/components/collections/teams/Request.vue b/components/collections/teams/Request.vue
index 9edf86b36..c18a04730 100644
--- a/components/collections/teams/Request.vue
+++ b/components/collections/teams/Request.vue
@@ -7,9 +7,9 @@
           @click="!doc ? selectRequest() : {}"
           v-tooltip="!doc ? $t('use_request') : ''"
         >
-          <i v-if="isSelected" class="material-icons"> check </i>
+          <i v-if="isSelected" class="text-green-400 material-icons">check_circle</i>
 
-          <span :class="getRequestLabelColor(request.method)">{{ request.method }}</span>
+          <span v-else :class="getRequestLabelColor(request.method)">{{ request.method }}</span>
           <span>{{ request.name }}</span>
         </button>
       </div>
@@ -102,7 +102,6 @@ export default {
             requestID: this.requestIndex,
           },
         })
-      else this.$store.commit("postwoman/selectRequest", { request: this.request })
     },
     removeRequest() {
       this.$emit("remove-request", {
diff --git a/pages/index.vue b/pages/index.vue
index d141de0fc..cf8b6df46 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1814,12 +1814,6 @@ export default {
       setTimeout(() => (target.innerHTML = '<i class="material-icons">clear_all</i>'), 1000)
     },
     saveRequest() {
-      if (!this.checkCollections()) {
-        this.$toast.error(this.$t("create_collection"), {
-          icon: "error",
-        })
-        return
-      }
       let urlAndPath = parseUrlAndPath(this.uri)
       this.editRequest = {
         url: decodeURI(urlAndPath.url),
diff --git a/pages/settings.vue b/pages/settings.vue
index 6e95b0fa5..ed56fb51e 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -297,14 +297,16 @@ export default Vue.extend({
     },
     syncCollections(): void {
       if (fb.currentUser !== null && this.SYNC_COLLECTIONS) {
-        fb.writeCollections(
-          JSON.parse(JSON.stringify(this.$store.state.postwoman.collections)),
-          "collections"
-        )
-        fb.writeCollections(
-          JSON.parse(JSON.stringify(this.$store.state.postwoman.collectionsGraphql)),
-          "collectionsGraphql"
-        )
+        if (this.$store.state.postwoman.collections)
+          fb.writeCollections(
+            JSON.parse(JSON.stringify(this.$store.state.postwoman.collections)),
+            "collections"
+          )
+        if (this.$store.state.postwoman.collectionsGraphql)
+          fb.writeCollections(
+            JSON.parse(JSON.stringify(this.$store.state.postwoman.collectionsGraphql)),
+            "collectionsGraphql"
+          )
       }
     },
     syncEnvironments(): void {