diff --git a/apps/mobile/app/components/dialogs/add-topic/index.js b/apps/mobile/app/components/dialogs/add-topic/index.js
index a1b617c87..77ae6e33b 100644
--- a/apps/mobile/app/components/dialogs/add-topic/index.js
+++ b/apps/mobile/app/components/dialogs/add-topic/index.js
@@ -72,12 +72,16 @@ export class AddTopicDialog extends React.Component {
       }
 
       if (!this.toEdit) {
-        await db.notebooks.notebook(this.notebook.id).topics.add(this.title);
+        await db.notebooks.topics(this.notebook.id).add({
+          title: this.title
+        });
       } else {
         let topic = this.toEdit;
         topic.title = this.title;
-
-        await db.notebooks.notebook(topic.notebookId).topics.add(topic);
+        await db.notebooks.topics(topic.notebookId).add({
+          id: topic.id,
+          title: topic.title
+        });
       }
       this.close();
       setTimeout(() => {
diff --git a/apps/mobile/app/components/sheets/add-notebook/index.js b/apps/mobile/app/components/sheets/add-notebook/index.js
index 076f397d4..86444a2b8 100644
--- a/apps/mobile/app/components/sheets/add-notebook/index.js
+++ b/apps/mobile/app/components/sheets/add-notebook/index.js
@@ -181,13 +181,20 @@ export class AddNotebookSheet extends React.Component {
         }
       });
 
-      await db.notebooks.notebook(toEdit.id).topics.add(...nextTopics);
+      await db.notebooks.topics(toEdit.id).add(
+        ...nextTopics.map((topic) => ({
+          title: topic
+        }))
+      );
+
       this.close();
     } else {
       newNotebookId = await db.notebooks.add({
         title: this.title,
         description: this.description,
-        topics: prevTopics,
+        topics: prevTopics.map((topic) => ({
+          title: topic
+        })),
         id: null
       });
     }
diff --git a/apps/mobile/app/components/sheets/add-to/index.js b/apps/mobile/app/components/sheets/add-to/index.js
index a5f2e1785..a10865e78 100644
--- a/apps/mobile/app/components/sheets/add-to/index.js
+++ b/apps/mobile/app/components/sheets/add-to/index.js
@@ -102,7 +102,9 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
         return false;
       }
 
-      await db.notebooks.notebook(item.id).topics.add(value);
+      await db.notebooks.topics(item.id).add({
+        title: value
+      });
       setNotebooks();
       return true;
     },
diff --git a/apps/mobile/app/components/sheets/move-notes/movenote.tsx b/apps/mobile/app/components/sheets/move-notes/movenote.tsx
index 8942aea3d..ce367dba5 100644
--- a/apps/mobile/app/components/sheets/move-notes/movenote.tsx
+++ b/apps/mobile/app/components/sheets/move-notes/movenote.tsx
@@ -109,7 +109,7 @@ export const MoveNotes = ({
       });
       return false;
     }
-    await db.notebooks?.notebook(currentNotebook.id)?.topics.add({
+    await db.notebooks?.topics(currentNotebook.id).add({
       title: value
     });
 
diff --git a/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-add-a-note-to-vault-1-snap.png b/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-add-a-note-to-vault-1-snap.png
index 25802ff29..9fcd84fff 100644
Binary files a/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-add-a-note-to-vault-1-snap.png and b/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-add-a-note-to-vault-1-snap.png differ
diff --git a/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-change-vault-password-1-snap.png b/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-change-vault-password-1-snap.png
index ba9441255..f2f05af4d 100644
Binary files a/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-change-vault-password-1-snap.png and b/apps/mobile/e2e/tests/__image_snapshots__/vault-e-2-e-js-vault-change-vault-password-1-snap.png differ
diff --git a/apps/mobile/e2e/tests/note.e2e.js b/apps/mobile/e2e/tests/note.e2e.js
index 8612e52cc..8a1997dbc 100644
--- a/apps/mobile/e2e/tests/note.e2e.js
+++ b/apps/mobile/e2e/tests/note.e2e.js
@@ -90,13 +90,13 @@ describe("NOTE TESTS", () => {
     await visibleByText("Pin to notifications");
   });
 
-  // it("Copy note", async () => {
-  //   await prepare();
-  //   await createNote();
-  //   await tapById(notesnook.listitem.menu);
-  //   await tapById("icon-Copy");
-  //   await visibleByText("Note copied to clipboard");
-  // });
+  it("Copy note", async () => {
+    await prepare();
+    await createNote();
+    await tapById(notesnook.listitem.menu);
+    await tapById("icon-Copy");
+    await visibleByText("Note copied to clipboard");
+  });
 
   it("Export note dialog should show", async () => {
     await prepare();
diff --git a/apps/mobile/e2e/tests/sort.e2e.js b/apps/mobile/e2e/tests/sort.e2e.js
index 7f74bf3c3..6b1cd8548 100644
--- a/apps/mobile/e2e/tests/sort.e2e.js
+++ b/apps/mobile/e2e/tests/sort.e2e.js
@@ -41,6 +41,7 @@ describe("Sort & filter", () => {
     await prepare();
     let webview = web(by.id(notesnook.editor.id));
     await createNote("Note 1", "Note 1");
+    await sleep(300);
     await createNote("Note 2", "Note 2");
     await sleep(300);
     await tapByText("Note 1");
diff --git a/apps/mobile/e2e/tests/tag.e2e.js b/apps/mobile/e2e/tests/tag.e2e.js
index e7c697ead..22e9baf31 100644
--- a/apps/mobile/e2e/tests/tag.e2e.js
+++ b/apps/mobile/e2e/tests/tag.e2e.js
@@ -46,7 +46,7 @@ describe("Tags", () => {
     await visibleByText(note.body);
   });
 
-  it("Untag a note", async () => {
+  it.only("Untag a note", async () => {
     await prepare();
     await createNote();
     await tapById(notesnook.listitem.menu);
@@ -58,8 +58,6 @@ describe("Tags", () => {
     await device.pressBack();
     await device.pressBack();
     await notVisibleByText("#testtag");
-    await navigate("Tags");
-    await notVisibleByText("#testtag");
   });
 
   it("Creat shortcut of a tag", async () => {