diff --git a/libs/importer/spec/onepassword-1pux-importer.spec.ts b/libs/importer/spec/onepassword-1pux-importer.spec.ts
index fe1b2801bdf..93de4be606b 100644
--- a/libs/importer/spec/onepassword-1pux-importer.spec.ts
+++ b/libs/importer/spec/onepassword-1pux-importer.spec.ts
@@ -56,6 +56,16 @@ describe("1Password 1Pux Importer", () => {
   const SecureNoteDataJson = JSON.stringify(SecureNoteData);
   const SanitizedExportJson = JSON.stringify(SanitizedExport);
 
+  it("should not import items with state 'archived'", async () => {
+    const importer = new OnePassword1PuxImporter();
+    const archivedLoginData = LoginData;
+    archivedLoginData["accounts"][0]["vaults"][0]["items"][0]["state"] = "archived";
+    const archivedDataJson = JSON.stringify(archivedLoginData);
+    const result = await importer.parse(archivedDataJson);
+    expect(result != null).toBe(true);
+    expect(result.ciphers.length).toBe(0);
+  });
+
   it("should parse login data", async () => {
     const importer = new OnePassword1PuxImporter();
     const result = await importer.parse(LoginDataJson);
diff --git a/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts b/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts
index 49269e72fa0..7a830194b8c 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/api-credentials.ts
@@ -26,7 +26,7 @@ export const APICredentialsData: ExportData = {
               favIndex: 0,
               createdAt: 1619465969,
               updatedAt: 1619466052,
-              trashed: false,
+              state: "active",
               categoryUuid: "112",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const APICredentialsData: ExportData = {
                         value: {
                           string: "apiuser@nullvalue.test",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const APICredentialsData: ExportData = {
                         value: {
                           concealed: "apiapiapiapiapiapiappy",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: true,
@@ -73,7 +71,6 @@ export const APICredentialsData: ExportData = {
                         value: {
                           menu: "jwt",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const APICredentialsData: ExportData = {
                         value: {
                           string: "filename.jwt",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const APICredentialsData: ExportData = {
                         value: {
                           date: 1301918460,
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const APICredentialsData: ExportData = {
                         value: {
                           date: 1932811260,
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const APICredentialsData: ExportData = {
                         value: {
                           string: "not.your.everyday.hostname",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts b/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts
index 7f3d8c080cd..6ffccafe514 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/bank-account.ts
@@ -26,7 +26,7 @@ export const BankAccountData: ExportData = {
               favIndex: 0,
               createdAt: 1619466056,
               updatedAt: 1619466187,
-              trashed: false,
+              state: "active",
               categoryUuid: "101",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           string: "Super Credit Union",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           string: "Cool Guy",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           menu: "checking",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           string: "111000999",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           string: "192837465918273645",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           string: "123456",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           string: "DE12 123456",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -153,7 +146,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           concealed: "5555",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: true,
@@ -175,7 +167,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           phone: "9399399933",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -191,7 +182,6 @@ export const BankAccountData: ExportData = {
                         value: {
                           string: "1 Fifth Avenue",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts b/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts
index 80258f13f05..74af97a4c2b 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/credit-card.ts
@@ -26,7 +26,7 @@ export const CreditCardData: ExportData = {
               favIndex: 0,
               createdAt: 1619465282,
               updatedAt: 1619465447,
-              trashed: false,
+              state: "active",
               categoryUuid: "002",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           string: "Fred Engels",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           creditCardType: "discover",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           creditCardNumber: "6011111111111117",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         clipboardFilter: "0123456789",
                         multiline: false,
@@ -90,7 +87,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           concealed: "1312",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: true,
@@ -106,7 +102,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           monthYear: 209912,
                         },
-                        indexAtSource: 4,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -122,7 +117,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           monthYear: 200101,
                         },
-                        indexAtSource: 5,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -138,7 +132,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           string: "card",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -160,7 +153,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           string: "Some bank",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -176,7 +168,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           phone: "123456",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -192,7 +183,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           phone: "0800123456",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -208,7 +198,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           phone: "+49123456",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -224,7 +213,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           url: "somebank.com",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -246,7 +234,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           concealed: "1234",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: true,
@@ -262,7 +249,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           string: "$1312",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -278,7 +264,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           string: "$500",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -294,7 +279,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           string: "1%",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -310,7 +294,6 @@ export const CreditCardData: ExportData = {
                         value: {
                           string: "123456",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/database.ts b/libs/importer/spec/test-data/onepassword-1pux/database.ts
index 17b6700bf6d..58631a2f98b 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/database.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/database.ts
@@ -26,7 +26,7 @@ export const DatabaseData: ExportData = {
               favIndex: 0,
               createdAt: 1619466193,
               updatedAt: 1619466276,
-              trashed: false,
+              state: "active",
               categoryUuid: "102",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           menu: "postgresql",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           string: "my.secret.db.server",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           string: "1337",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           string: "user_database",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           string: "cooldbuser",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           concealed: "^+kTjhLaN7wVPAhGU)*J",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           string: "ASDIUFU-283234",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -153,7 +146,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           string: "cdbu",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -169,7 +161,6 @@ export const DatabaseData: ExportData = {
                         value: {
                           string: "ssh",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts b/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts
index 9f7260d63d3..54a52f36999 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/drivers-license.ts
@@ -26,7 +26,7 @@ export const DriversLicenseData: ExportData = {
               favIndex: 0,
               createdAt: 1619466279,
               updatedAt: 1619466425,
-              trashed: false,
+              state: "active",
               categoryUuid: "103",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "Michael Scarn",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "2120 Mifflin Rd.",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           date: 252504060,
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           gender: "male",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "5'11\"",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "12345678901",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "C",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -153,7 +146,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "B",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -169,7 +161,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "Pennsylvania",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -185,7 +176,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           string: "United States",
                         },
-                        indexAtSource: 9,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -201,7 +191,6 @@ export const DriversLicenseData: ExportData = {
                         value: {
                           monthYear: 203012,
                         },
-                        indexAtSource: 10,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-account.ts b/libs/importer/spec/test-data/onepassword-1pux/email-account.ts
index a6de6b55b22..0d94973ec29 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/email-account.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/email-account.ts
@@ -26,7 +26,7 @@ export const EmailAccountData: ExportData = {
               favIndex: 0,
               createdAt: 1619466428,
               updatedAt: 1619466585,
-              trashed: false,
+              state: "active",
               categoryUuid: "111",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           menu: "either",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "someuser@nullvalue.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "mailserver.nullvalue.test",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "587",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           concealed: "u1jsf<UI*&YU&^T",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           menu: "TLS",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           menu: "kerberos_v5",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -159,7 +152,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "mailserver.nullvalue.test",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -175,7 +167,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "589",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -191,7 +182,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "someuser@nullvalue.test",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -207,7 +197,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           concealed: "(*1674%^UIUJ*UI(IUI8u98uyy",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -223,7 +212,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           menu: "TLS",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -239,7 +227,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           menu: "password",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -261,7 +248,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "Telum",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -277,7 +263,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "https://telum.nullvalue.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -293,7 +278,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "2346666666",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -309,7 +293,6 @@ export const EmailAccountData: ExportData = {
                         value: {
                           string: "18005557777",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts
index 932213c51f4..009743dfd08 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity.ts
@@ -26,7 +26,7 @@ export const EmailFieldOnIdentityData: ExportData = {
               favIndex: 0,
               createdAt: 1619465450,
               updatedAt: 1619465789,
-              trashed: false,
+              state: "active",
               categoryUuid: "004",
               details: {
                 loginFields: [],
@@ -55,7 +55,6 @@ export const EmailFieldOnIdentityData: ExportData = {
                             provider: "myEmailProvider",
                           },
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts
index fb4ef7935a4..591d27bd227 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/email-field-on-identity_prefilled.ts
@@ -26,7 +26,7 @@ export const EmailFieldOnIdentityPrefilledData: ExportData = {
               favIndex: 0,
               createdAt: 1619465450,
               updatedAt: 1619465789,
-              trashed: false,
+              state: "active",
               categoryUuid: "004",
               details: {
                 loginFields: [],
@@ -52,7 +52,6 @@ export const EmailFieldOnIdentityPrefilledData: ExportData = {
                         value: {
                           string: "gengels@nullvalue.test",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -71,7 +70,6 @@ export const EmailFieldOnIdentityPrefilledData: ExportData = {
                             provider: "myEmailProvider",
                           },
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/email-field.ts b/libs/importer/spec/test-data/onepassword-1pux/email-field.ts
index 97cca39d0ab..f6258bda7fa 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/email-field.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/email-field.ts
@@ -26,7 +26,7 @@ export const EmailFieldData: ExportData = {
               favIndex: 1,
               createdAt: 1619467985,
               updatedAt: 1619468230,
-              trashed: false,
+              state: "active",
               categoryUuid: "100",
               details: {
                 loginFields: [],
@@ -49,7 +49,6 @@ export const EmailFieldData: ExportData = {
                             provider: "myEmailProvider",
                           },
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts b/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts
index acc10a403d9..c97a2bbaf45 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/identity-data.ts
@@ -26,7 +26,7 @@ export const IdentityData: ExportData = {
               favIndex: 0,
               createdAt: 1619465450,
               updatedAt: 1619465789,
-              trashed: false,
+              state: "active",
               categoryUuid: "004",
               details: {
                 loginFields: [],
@@ -42,7 +42,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "George",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -58,7 +57,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "S",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -74,7 +72,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "Engels",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -90,7 +87,6 @@ export const IdentityData: ExportData = {
                         value: {
                           menu: "male",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -106,7 +102,6 @@ export const IdentityData: ExportData = {
                         value: {
                           date: 347198460,
                         },
-                        indexAtSource: 4,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -122,7 +117,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "Steel Worker",
                         },
-                        indexAtSource: 5,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -138,7 +132,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "Acme Inc.",
                         },
-                        indexAtSource: 6,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -154,7 +147,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "QA",
                         },
-                        indexAtSource: 7,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -170,7 +162,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "Quality Assurance Manager",
                         },
-                        indexAtSource: 8,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -198,7 +189,6 @@ export const IdentityData: ExportData = {
                             state: "California",
                           },
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -214,7 +204,6 @@ export const IdentityData: ExportData = {
                         value: {
                           phone: "4565555555",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -230,7 +219,6 @@ export const IdentityData: ExportData = {
                         value: {
                           phone: "4575555555",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -246,7 +234,6 @@ export const IdentityData: ExportData = {
                         value: {
                           phone: "4585555555",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -262,7 +249,6 @@ export const IdentityData: ExportData = {
                         value: {
                           phone: "4595555555",
                         },
-                        indexAtSource: 4,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -284,7 +270,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "gengels",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -300,7 +285,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "Who's a super cool guy?",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -316,7 +300,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "Me, buddy.",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -332,7 +315,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "gengels@nullvalue.test",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -348,7 +330,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "cv.gengels.nullvalue.test",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -364,7 +345,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "12345678",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -380,7 +360,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "skypeisbad1619",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -396,7 +375,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "aollol@lololol.aol.com",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -412,7 +390,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "sk8rboi13@yah00.com",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -428,7 +405,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "msnothankyou@msn&m&m.com",
                         },
-                        indexAtSource: 9,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -444,7 +420,6 @@ export const IdentityData: ExportData = {
                         value: {
                           string: "super cool guy",
                         },
-                        indexAtSource: 10,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/login-data.ts b/libs/importer/spec/test-data/onepassword-1pux/login-data.ts
index b7b2fe15861..dc6a026d835 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/login-data.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/login-data.ts
@@ -26,7 +26,7 @@ export const LoginData: ExportData = {
               favIndex: 0,
               createdAt: 1635522833,
               updatedAt: 1635522872,
-              trashed: false,
+              state: "active",
               categoryUuid: "001",
               details: {
                 loginFields: [
@@ -68,7 +68,6 @@ export const LoginData: ExportData = {
                         value: {
                           string: "username123123",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -84,7 +83,6 @@ export const LoginData: ExportData = {
                         value: {
                           totp: "otpseed777",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts b/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts
index df300560d95..67a929b13b1 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/medical-record.ts
@@ -26,7 +26,7 @@ export const MedicalRecordData: ExportData = {
               favIndex: 0,
               createdAt: 1641220207,
               updatedAt: 1641220326,
-              trashed: false,
+              state: "active",
               categoryUuid: "113",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           date: 1641038460,
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           string: "some hospital/clinic",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -74,7 +72,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           string: "Some Doctor",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -91,7 +88,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           string: "Me",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -108,7 +104,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           string: "unwell",
                         },
-                        indexAtSource: 4,
                         guarded: true,
                         multiline: true,
                         dontGenerate: false,
@@ -131,7 +126,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           string: "Insuline",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -148,7 +142,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           string: "1",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -165,7 +158,6 @@ export const MedicalRecordData: ExportData = {
                         value: {
                           string: "multiple times a day",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         multiline: true,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/membership.ts b/libs/importer/spec/test-data/onepassword-1pux/membership.ts
index fd1bf56ac79..5e36e8e6c9f 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/membership.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/membership.ts
@@ -26,7 +26,7 @@ export const MembershipData: ExportData = {
               favIndex: 1,
               createdAt: 1619467269,
               updatedAt: 1619467368,
-              trashed: false,
+              state: "active",
               categoryUuid: "105",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const MembershipData: ExportData = {
                         value: {
                           string: "National Public Library",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const MembershipData: ExportData = {
                         value: {
                           url: "https://npl.nullvalue.gov.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const MembershipData: ExportData = {
                         value: {
                           phone: "9995555555",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const MembershipData: ExportData = {
                         value: {
                           string: "George Engels",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const MembershipData: ExportData = {
                         value: {
                           monthYear: 199901,
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const MembershipData: ExportData = {
                         value: {
                           monthYear: 203412,
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const MembershipData: ExportData = {
                         value: {
                           string: "64783862",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -153,7 +146,6 @@ export const MembershipData: ExportData = {
                         value: {
                           concealed: "19191",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts b/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts
index 0f07044061e..38f81783671 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/onepux_example.ts
@@ -26,7 +26,7 @@ export const OnePuxExampleFile: ExportData = {
               favIndex: 1,
               createdAt: 1614298956,
               updatedAt: 1635346445,
-              trashed: false,
+              state: "active",
               categoryUuid: "001",
               details: {
                 loginFields: [
@@ -50,7 +50,6 @@ export const OnePuxExampleFile: ExportData = {
                         value: {
                           concealed: "12345",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts b/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts
index 071be0fb540..aa8df12948e 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/outdoor-license.ts
@@ -26,7 +26,7 @@ export const OutdoorLicenseData: ExportData = {
               favIndex: 0,
               createdAt: 1619467374,
               updatedAt: 1619467492,
-              trashed: false,
+              state: "active",
               categoryUuid: "104",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const OutdoorLicenseData: ExportData = {
                         value: {
                           string: "Cash Bandit",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const OutdoorLicenseData: ExportData = {
                         value: {
                           date: 1617278460,
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const OutdoorLicenseData: ExportData = {
                         value: {
                           date: 2343124860,
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const OutdoorLicenseData: ExportData = {
                         value: {
                           string: "Bananas,blueberries,corn",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const OutdoorLicenseData: ExportData = {
                         value: {
                           string: "100/each",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const OutdoorLicenseData: ExportData = {
                         value: {
                           string: "Washington",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const OutdoorLicenseData: ExportData = {
                         value: {
                           string: "United States of America",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/passport.ts b/libs/importer/spec/test-data/onepassword-1pux/passport.ts
index a64c9d3d029..00336aa70cd 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/passport.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/passport.ts
@@ -26,7 +26,7 @@ export const PassportData: ExportData = {
               favIndex: 0,
               createdAt: 1619467498,
               updatedAt: 1619467655,
-              trashed: false,
+              state: "active",
               categoryUuid: "106",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const PassportData: ExportData = {
                         value: {
                           string: "US Passport",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const PassportData: ExportData = {
                         value: {
                           string: "United States of America",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const PassportData: ExportData = {
                         value: {
                           string: "76436847",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const PassportData: ExportData = {
                         value: {
                           string: "David Global",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const PassportData: ExportData = {
                         value: {
                           gender: "female",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const PassportData: ExportData = {
                         value: {
                           string: "International",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const PassportData: ExportData = {
                         value: {
                           string: "Department of State",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -153,7 +146,6 @@ export const PassportData: ExportData = {
                         value: {
                           date: 418046460,
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -169,7 +161,6 @@ export const PassportData: ExportData = {
                         value: {
                           string: "A cave somewhere in Maine",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -185,7 +176,6 @@ export const PassportData: ExportData = {
                         value: {
                           date: 1577880060,
                         },
-                        indexAtSource: 9,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -201,7 +191,6 @@ export const PassportData: ExportData = {
                         value: {
                           date: 2524651260,
                         },
-                        indexAtSource: 10,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/password.ts b/libs/importer/spec/test-data/onepassword-1pux/password.ts
index 819a0546d64..e416ab9c715 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/password.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/password.ts
@@ -26,7 +26,7 @@ export const PasswordData: ExportData = {
               favIndex: 0,
               createdAt: 1619465796,
               updatedAt: 1619465869,
-              trashed: false,
+              state: "active",
               categoryUuid: "005",
               details: {
                 loginFields: [],
diff --git a/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts b/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts
index 5dcb98160bc..75333086435 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/rewards-program.ts
@@ -26,7 +26,7 @@ export const RewardsProgramData: ExportData = {
               favIndex: 0,
               createdAt: 1619467659,
               updatedAt: 1619467765,
-              trashed: false,
+              state: "active",
               categoryUuid: "107",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           string: "Super Cool Store Co.",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           string: "Chef Coldroom",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           string: "member-29813569",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         clipboardFilter:
                           "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
@@ -91,7 +88,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           concealed: "99913",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -113,7 +109,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           string: "additional member id",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -129,7 +124,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           monthYear: 202101,
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -145,7 +139,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           phone: "123456",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -161,7 +154,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           phone: "123456",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -177,7 +169,6 @@ export const RewardsProgramData: ExportData = {
                         value: {
                           url: "supercoolstore.com",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts b/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts
index 4e7dde9ab84..284921eb80e 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/sanitized-export.ts
@@ -26,7 +26,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 1,
               createdAt: 1619465029,
               updatedAt: 1636576578,
-              trashed: false,
+              state: "active",
               categoryUuid: "001",
               details: {
                 loginFields: [
@@ -57,7 +57,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           totp: "otpseed777",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -79,7 +78,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 1637841660,
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -115,7 +113,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619467769,
               updatedAt: 1619467906,
-              trashed: false,
+              state: "active",
               categoryUuid: "110",
               details: {
                 loginFields: [],
@@ -130,7 +128,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "https://coolserver.nullvalue.test",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -146,7 +143,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "frankly-notsure",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -162,7 +158,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "*&YHJI87yjy78u",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -184,7 +179,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "https://coolserver.nullvalue.test/admin",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -200,7 +194,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "frankly-idontknowwhatimdoing",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -216,7 +209,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "^%RY&^YUiju8iUYHJI(U",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -238,7 +230,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Private Hosting Provider Inc.",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -254,7 +245,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "https://phpi.nullvalue.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -270,7 +260,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "https://phpi.nullvalue.test/support",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -286,7 +275,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "8882569382",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -315,7 +303,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619465117,
               updatedAt: 1619465209,
-              trashed: false,
+              state: "active",
               categoryUuid: "001",
               details: {
                 loginFields: [
@@ -349,7 +337,6 @@ export const SanitizedExport: ExportData = {
                             provider: null,
                           },
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -365,7 +352,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: null,
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -381,7 +367,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "4565555555",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -417,7 +402,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619465875,
               updatedAt: 1619535673,
-              trashed: true,
+              state: "archived",
               categoryUuid: "006",
               details: {
                 loginFields: [],
@@ -444,7 +429,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619466056,
               updatedAt: 1619466187,
-              trashed: false,
+              state: "active",
               categoryUuid: "101",
               details: {
                 loginFields: [],
@@ -459,7 +444,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Super Credit Union",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -475,7 +459,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Cool Guy",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -491,7 +474,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "checking",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -507,7 +489,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "111000999",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -523,7 +504,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "192837465918273645",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -539,7 +519,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -555,7 +534,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -571,7 +549,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "5555",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: true,
@@ -593,7 +570,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "9399399933",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -609,7 +585,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "1 Fifth Avenue",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -639,7 +614,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619466193,
               updatedAt: 1619466276,
-              trashed: false,
+              state: "active",
               categoryUuid: "102",
               details: {
                 loginFields: [],
@@ -654,7 +629,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "postgresql",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -670,7 +644,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "my.secret.db.server",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -686,7 +659,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "1337",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -702,7 +674,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "user_database",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -718,7 +689,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "cooldbuser",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -734,7 +704,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "^+kTjhLaN7wVPAhGU)*J",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -750,7 +719,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "ASDIUFU-283234",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -766,7 +734,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "cdbu",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -782,7 +749,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "ssh",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -811,7 +777,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 1,
               createdAt: 1619464754,
               updatedAt: 1619465025,
-              trashed: false,
+              state: "active",
               categoryUuid: "001",
               details: {
                 loginFields: [
@@ -854,7 +820,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619466279,
               updatedAt: 1619466425,
-              trashed: false,
+              state: "active",
               categoryUuid: "103",
               details: {
                 loginFields: [],
@@ -869,7 +835,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Michael Scarn",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -885,7 +850,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "2120 Mifflin Rd.",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -901,7 +865,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 252504060,
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -917,7 +880,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           gender: "male",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -933,7 +895,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "5'11\"",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -949,7 +910,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "12345678901",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -965,7 +925,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "C",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -981,7 +940,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "B",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -997,7 +955,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Pennsylvania",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1013,7 +970,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "United States",
                         },
-                        indexAtSource: 9,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1029,7 +985,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           monthYear: 203012,
                         },
-                        indexAtSource: 10,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1058,7 +1013,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619466428,
               updatedAt: 1619466585,
-              trashed: false,
+              state: "active",
               categoryUuid: "111",
               details: {
                 loginFields: [],
@@ -1073,7 +1028,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "either",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1089,7 +1043,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "mscottscarn@nullvalue.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1105,7 +1058,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "mailserver.nullvalue.test",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1121,7 +1073,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "587",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1137,7 +1088,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "uajsf*UI*&YU&^T",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1153,7 +1103,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "TLS",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1169,7 +1118,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "kerberos_v5",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1191,7 +1139,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "mailserver.nullvalue.test",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1207,7 +1154,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "589",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1223,7 +1169,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "mscottscarn@nullvalue.test",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1239,7 +1184,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "(*UJUTT%^UIUJ*UI(IUI8u98uyy",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1255,7 +1199,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "TLS",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1271,7 +1214,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "password",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1293,7 +1235,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Telum",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1309,7 +1250,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "https://telum.nullvalue.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1325,7 +1265,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "2346666666",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1341,7 +1280,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "18005557777",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1370,7 +1308,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 1,
               createdAt: 1619467985,
               updatedAt: 1619468230,
-              trashed: false,
+              state: "active",
               categoryUuid: "100",
               details: {
                 loginFields: [],
@@ -1385,7 +1323,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "5.10.1000",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1401,7 +1338,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "265453-13457355-847327",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: true,
                         dontGenerate: false,
@@ -1423,7 +1359,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Kay Riddler",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1442,7 +1377,6 @@ export const SanitizedExport: ExportData = {
                             provider: null,
                           },
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1458,7 +1392,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Riddles and Jigsaw Puzzles GmbH",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1480,7 +1413,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://limuxcompany.nullvalue.test/5.10.1000/isos",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1496,7 +1428,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Limux Software and Hardware",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1512,7 +1443,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://limuxcompany.nullvalue.test/",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1528,7 +1458,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "$999",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1547,7 +1476,6 @@ export const SanitizedExport: ExportData = {
                             provider: null,
                           },
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1569,7 +1497,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 1617278460,
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1585,7 +1512,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "594839",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1601,7 +1527,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "$1086.59",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1630,7 +1555,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619467498,
               updatedAt: 1619467655,
-              trashed: false,
+              state: "active",
               categoryUuid: "106",
               details: {
                 loginFields: [],
@@ -1645,7 +1570,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "US Passport",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1661,7 +1585,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "United States of America",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1677,7 +1600,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "76436847",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1693,7 +1615,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "David Global",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1709,7 +1630,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           gender: "female",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1725,7 +1645,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "International",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1741,7 +1660,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Department of State",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1757,7 +1675,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 418046460,
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1773,7 +1690,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "A cave somewhere in Maine",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1789,7 +1705,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 1577880060,
                         },
-                        indexAtSource: 9,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1805,7 +1720,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 2524651260,
                         },
-                        indexAtSource: 10,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1835,7 +1749,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619467374,
               updatedAt: 1619467492,
-              trashed: false,
+              state: "active",
               categoryUuid: "104",
               details: {
                 loginFields: [],
@@ -1850,7 +1764,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Cash Bandit",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1866,7 +1779,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 1617278460,
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1882,7 +1794,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 2343124860,
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1898,7 +1809,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Bananas,blueberries,corn",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1914,7 +1824,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "100/each",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1930,7 +1839,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Washington",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1946,7 +1854,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "United States of America",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -1975,7 +1882,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619465796,
               updatedAt: 1619465869,
-              trashed: false,
+              state: "active",
               categoryUuid: "005",
               details: {
                 loginFields: [],
@@ -2004,7 +1911,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619468234,
               updatedAt: 1619468316,
-              trashed: false,
+              state: "active",
               categoryUuid: "109",
               details: {
                 loginFields: [],
@@ -2019,7 +1926,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Super-SSID",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2035,7 +1941,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "coolpasswordadmin",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2051,7 +1956,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "10.0.0.1",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2067,7 +1971,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "airport-1D",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2083,7 +1986,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Super-SSID-name",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2099,7 +2001,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "wpa3e",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2115,7 +2016,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "coolpasswordbuddy",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2131,7 +2031,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "coolpasswordbuddy",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2160,7 +2059,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619467659,
               updatedAt: 1619467765,
-              trashed: false,
+              state: "active",
               categoryUuid: "107",
               details: {
                 loginFields: [],
@@ -2175,7 +2074,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Super Cool Store Co.",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2191,7 +2089,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Chef Coldroom",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2207,7 +2104,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "member-29813569",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         clipboardFilter:
                           "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
@@ -2225,7 +2121,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "99913",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2247,7 +2142,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2263,7 +2157,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           monthYear: null,
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2279,7 +2172,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2295,7 +2187,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2311,7 +2202,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2340,7 +2230,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 1,
               createdAt: 1619467910,
               updatedAt: 1619467982,
-              trashed: false,
+              state: "active",
               categoryUuid: "108",
               details: {
                 loginFields: [],
@@ -2355,7 +2245,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Jack Judd",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2371,7 +2260,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "131-216-1900",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: true,
@@ -2400,7 +2288,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 1,
               createdAt: 1619467269,
               updatedAt: 1619467368,
-              trashed: false,
+              state: "active",
               categoryUuid: "105",
               details: {
                 loginFields: [],
@@ -2415,7 +2303,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "National Public Library",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2431,7 +2318,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://npl.nullvalue.gov.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2447,7 +2333,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "9995555555",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2463,7 +2348,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "George Engels",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2479,7 +2363,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           monthYear: 199901,
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2495,7 +2378,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           monthYear: 203412,
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2511,7 +2393,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "64783862",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2527,7 +2408,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "19191",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2557,7 +2437,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619465450,
               updatedAt: 1619465789,
-              trashed: false,
+              state: "active",
               categoryUuid: "004",
               details: {
                 loginFields: [],
@@ -2573,7 +2453,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "George",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2589,7 +2468,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "S",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2605,7 +2483,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Engels",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2621,7 +2498,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "male",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2637,7 +2513,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 347198460,
                         },
-                        indexAtSource: 4,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2653,7 +2528,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Steel Worker",
                         },
-                        indexAtSource: 5,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2669,7 +2543,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Acme Inc.",
                         },
-                        indexAtSource: 6,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2685,7 +2558,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "QA",
                         },
-                        indexAtSource: 7,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2701,7 +2573,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Quality Assurance Manager",
                         },
-                        indexAtSource: 8,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2729,7 +2600,6 @@ export const SanitizedExport: ExportData = {
                             state: "California",
                           },
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2745,7 +2615,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "4565555555",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2761,7 +2630,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "4575555555",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2777,7 +2645,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "4585555555",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2793,7 +2660,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "4595555555",
                         },
-                        indexAtSource: 4,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2815,7 +2681,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "gengels",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2831,7 +2696,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Who's a super cool guy?",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2847,7 +2711,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Me, buddy.",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2863,7 +2726,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "gengels@nullvalue.test",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -2879,7 +2741,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "cv.gengels.nullvalue.test",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2895,7 +2756,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2911,7 +2771,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "skypeisbad1619",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2927,7 +2786,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "aollol@lololol.aol.com",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2943,7 +2801,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "sk8rboi13@yah00.com",
                         },
-                        indexAtSource: 8,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2959,7 +2816,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "msnothankyou@msn&m&m.com",
                         },
-                        indexAtSource: 9,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -2975,7 +2831,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "super cool guy",
                         },
-                        indexAtSource: 10,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3004,7 +2859,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619465969,
               updatedAt: 1619466052,
-              trashed: false,
+              state: "active",
               categoryUuid: "112",
               details: {
                 loginFields: [],
@@ -3019,7 +2874,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "apiuser@nullvalue.test",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -3035,7 +2889,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "apiapiapiapiapiapiappy",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: true,
@@ -3051,7 +2904,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "jwt",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3067,7 +2919,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "filename.jwt",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3083,7 +2934,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 1301918460,
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3099,7 +2949,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: 1932811260,
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3115,7 +2964,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "not.your.everyday.hostname",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3144,7 +2992,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619465226,
               updatedAt: 1619465278,
-              trashed: false,
+              state: "active",
               categoryUuid: "003",
               details: {
                 loginFields: [],
@@ -3167,7 +3015,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1619465282,
               updatedAt: 1619465447,
-              trashed: false,
+              state: "active",
               categoryUuid: "002",
               details: {
                 loginFields: [],
@@ -3182,7 +3030,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Fred Engels",
                         },
-                        indexAtSource: 0,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -3198,7 +3045,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           creditCardType: "discover",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -3214,7 +3060,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           creditCardNumber: "1234123445676789",
                         },
-                        indexAtSource: 2,
                         guarded: true,
                         clipboardFilter: "0123456789",
                         multiline: false,
@@ -3231,7 +3076,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "1312",
                         },
-                        indexAtSource: 3,
                         guarded: true,
                         multiline: false,
                         dontGenerate: true,
@@ -3247,7 +3091,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           monthYear: 209912,
                         },
-                        indexAtSource: 4,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -3263,7 +3106,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           monthYear: 200101,
                         },
-                        indexAtSource: 5,
                         guarded: true,
                         multiline: false,
                         dontGenerate: false,
@@ -3279,7 +3121,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "card",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3301,7 +3142,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3317,7 +3157,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3333,7 +3172,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3349,7 +3187,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           phone: "",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3365,7 +3202,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3387,7 +3223,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: true,
@@ -3403,7 +3238,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "$1312",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3419,7 +3253,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "$500",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3435,7 +3268,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "1%",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3451,7 +3283,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3492,7 +3323,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1623365944,
               updatedAt: 1623365944,
-              trashed: false,
+              state: "active",
               categoryUuid: "001",
               details: {
                 loginFields: [
@@ -3525,7 +3356,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1577652307,
               updatedAt: 1577652307,
-              trashed: false,
+              state: "active",
               categoryUuid: "109",
               details: {
                 loginFields: [],
@@ -3540,7 +3371,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "pixel 2Xl",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3556,7 +3386,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "BqatGTVQ9TCN72tLbjrsHqkb",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3572,7 +3401,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3588,7 +3416,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3604,7 +3431,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3620,7 +3446,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3636,7 +3461,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3652,7 +3476,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3678,7 +3501,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1595730395,
               updatedAt: 1624728074,
-              trashed: false,
+              state: "active",
               categoryUuid: "109",
               details: {
                 loginFields: [],
@@ -3692,7 +3515,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3708,7 +3530,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "10.0.0.1",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3724,7 +3545,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Username: admin",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3740,7 +3560,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "password: Password!",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3756,7 +3575,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Astroworld",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3772,7 +3590,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           menu: "",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3788,7 +3605,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "Password!",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3804,7 +3620,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           concealed: "",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3830,7 +3645,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1635522833,
               updatedAt: 1635522872,
-              trashed: false,
+              state: "active",
               categoryUuid: "001",
               details: {
                 loginFields: [
@@ -3908,7 +3723,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "username123123",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3956,7 +3770,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1607125760,
               updatedAt: 1607125765,
-              trashed: false,
+              state: "active",
               categoryUuid: "100",
               details: {
                 loginFields: [],
@@ -3971,7 +3785,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -3987,7 +3800,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "12345-C4702-349F5-D84A1-C1FDF-54321",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: true,
                         dontGenerate: false,
@@ -4009,7 +3821,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4028,7 +3839,6 @@ export const SanitizedExport: ExportData = {
                             provider: null,
                           },
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4044,7 +3854,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4066,7 +3875,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4082,7 +3890,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4098,7 +3905,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4114,7 +3920,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4133,7 +3938,6 @@ export const SanitizedExport: ExportData = {
                             provider: null,
                           },
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4155,7 +3959,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           date: null,
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4171,7 +3974,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4187,7 +3989,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4216,7 +4017,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1609647825,
               updatedAt: 1609647832,
-              trashed: false,
+              state: "active",
               categoryUuid: "003",
               details: {
                 loginFields: [],
@@ -4238,7 +4039,7 @@ export const SanitizedExport: ExportData = {
               favIndex: 0,
               createdAt: 1576938097,
               updatedAt: 1576938097,
-              trashed: false,
+              state: "active",
               categoryUuid: "003",
               details: {
                 loginFields: [],
@@ -4254,7 +4055,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://1password.com/downloads",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4270,7 +4070,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Install 1Password everywhere you need your passwords.",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4292,7 +4091,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://1password.com/downloads/#browsers",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4308,7 +4106,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Install 1Password in your browser to save and fill passwords.",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4330,7 +4127,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "1. Sign in to your favorite website.",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4346,7 +4142,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "2. 1Password will ask to save your username and password.",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4362,7 +4157,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "3. Click Save Login.",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4384,7 +4178,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://support.1password.com/explore/extension/",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4400,7 +4193,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Save and fill passwords, credit cards, and addresses.",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4422,7 +4214,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           string: "Check out our videos and articles:",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4438,7 +4229,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://youtube.com/1PasswordVideos",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4454,7 +4244,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://support.1password.com/",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4470,7 +4259,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://blog.1password.com/",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -4486,7 +4274,6 @@ export const SanitizedExport: ExportData = {
                         value: {
                           url: "https://support.1password.com/contact-us/",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts b/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts
index ae6693cc6fd..d7f93c9895c 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/secure-note.ts
@@ -26,7 +26,7 @@ export const SecureNoteData: ExportData = {
               favIndex: 0,
               createdAt: 1619465226,
               updatedAt: 1619465278,
-              trashed: false,
+              state: "active",
               categoryUuid: "003",
               details: {
                 loginFields: [],
diff --git a/libs/importer/spec/test-data/onepassword-1pux/server.ts b/libs/importer/spec/test-data/onepassword-1pux/server.ts
index 4edbd3fbdab..59e7a841f9c 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/server.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/server.ts
@@ -26,7 +26,7 @@ export const ServerData: ExportData = {
               favIndex: 0,
               createdAt: 1619467769,
               updatedAt: 1619467906,
-              trashed: false,
+              state: "active",
               categoryUuid: "110",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "https://coolserver.nullvalue.test",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "frankly-notsure",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const ServerData: ExportData = {
                         value: {
                           concealed: "*&YHJI87yjy78u",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -95,7 +92,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "https://coolserver.nullvalue.test/admin",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -111,7 +107,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "frankly-idontknowwhatimdoing",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -127,7 +122,6 @@ export const ServerData: ExportData = {
                         value: {
                           concealed: "^%RY&^YUiju8iUYHJI(U",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -149,7 +143,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "Private Hosting Provider Inc.",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -165,7 +158,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "https://phpi.nullvalue.test",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -181,7 +173,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "https://phpi.nullvalue.test/support",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -197,7 +188,6 @@ export const ServerData: ExportData = {
                         value: {
                           string: "8882569382",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/software-license.ts b/libs/importer/spec/test-data/onepassword-1pux/software-license.ts
index f39747413b7..a6ccea53059 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/software-license.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/software-license.ts
@@ -26,7 +26,7 @@ export const SoftwareLicenseData: ExportData = {
               favIndex: 1,
               createdAt: 1619467985,
               updatedAt: 1619468230,
-              trashed: false,
+              state: "active",
               categoryUuid: "100",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "5.10.1000",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "265453-13457355-847327",
                         },
-                        indexAtSource: 1,
                         guarded: true,
                         multiline: true,
                         dontGenerate: false,
@@ -79,7 +77,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "Kay Riddler",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -98,7 +95,6 @@ export const SoftwareLicenseData: ExportData = {
                             provider: null,
                           },
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -114,7 +110,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "Riddles and Jigsaw Puzzles GmbH",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -136,7 +131,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           url: "https://limuxcompany.nullvalue.test/5.10.1000/isos",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -152,7 +146,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "Limux Software and Hardware",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -168,7 +161,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           url: "https://limuxcompany.nullvalue.test/",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -184,7 +176,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "$999",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -203,7 +194,6 @@ export const SoftwareLicenseData: ExportData = {
                             provider: null,
                           },
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -225,7 +215,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           date: 1617278460,
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -241,7 +230,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "594839",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -257,7 +245,6 @@ export const SoftwareLicenseData: ExportData = {
                         value: {
                           string: "$1086.59",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/ssn.ts b/libs/importer/spec/test-data/onepassword-1pux/ssn.ts
index c8f692e541c..4b1c5e13739 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/ssn.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/ssn.ts
@@ -26,7 +26,7 @@ export const SSNData: ExportData = {
               favIndex: 1,
               createdAt: 1619467910,
               updatedAt: 1619467982,
-              trashed: false,
+              state: "active",
               categoryUuid: "108",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const SSNData: ExportData = {
                         value: {
                           string: "Jack Judd",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const SSNData: ExportData = {
                         value: {
                           concealed: "131-216-1900",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: true,
diff --git a/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts b/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts
index ad5a453a83a..cef06abe612 100644
--- a/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts
+++ b/libs/importer/spec/test-data/onepassword-1pux/wireless-router.ts
@@ -26,7 +26,7 @@ export const WirelessRouterData: ExportData = {
               favIndex: 0,
               createdAt: 1577652307,
               updatedAt: 1577652307,
-              trashed: false,
+              state: "active",
               categoryUuid: "109",
               details: {
                 loginFields: [],
@@ -41,7 +41,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           string: "pixel 2Xl",
                         },
-                        indexAtSource: 0,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -57,7 +56,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           concealed: "BqatGTVQ9TCN72tLbjrsHqkb",
                         },
-                        indexAtSource: 1,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -73,7 +71,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           string: "127.0.0.1",
                         },
-                        indexAtSource: 2,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -89,7 +86,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           string: "some airportId",
                         },
-                        indexAtSource: 3,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -105,7 +101,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           string: "some network name",
                         },
-                        indexAtSource: 4,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -121,7 +116,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           menu: "WPA",
                         },
-                        indexAtSource: 5,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -137,7 +131,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           concealed: "wifipassword",
                         },
-                        indexAtSource: 6,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
@@ -153,7 +146,6 @@ export const WirelessRouterData: ExportData = {
                         value: {
                           concealed: "diskpassword",
                         },
-                        indexAtSource: 7,
                         guarded: false,
                         multiline: false,
                         dontGenerate: false,
diff --git a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
index 34af24fe228..f670169400b 100644
--- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts
@@ -37,7 +37,7 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer {
     // const personalVaults = account.vaults[0].filter((v) => v.attrs.type === VaultAttributeTypeEnum.Personal);
     account.vaults.forEach((vault: VaultsEntity) => {
       vault.items.forEach((item: Item) => {
-        if (item.trashed === true) {
+        if (item.state === "archived") {
           return;
         }
 
diff --git a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts
index ebb52386545..353fcf1337e 100644
--- a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts
+++ b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts
@@ -53,7 +53,7 @@ export interface Item {
   favIndex: number;
   createdAt: number;
   updatedAt: number;
-  trashed?: boolean;
+  state: "active" | "archived";
   categoryUuid: string;
   details: Details;
   overview: Overview;
@@ -88,12 +88,12 @@ export interface SectionsEntity {
   title: string;
   name?: string | null;
   fields?: FieldsEntity[] | null;
+  hideAddAnotherField?: boolean | null;
 }
 export interface FieldsEntity {
   title: string;
   id: string;
   value: Value;
-  indexAtSource: number;
   guarded: boolean;
   multiline: boolean;
   dontGenerate: boolean;
@@ -153,6 +153,8 @@ export interface Overview {
   pbe?: number | null;
   pgrng?: boolean | null;
   tags?: string[] | null;
+  icons?: string | null;
+  watchtowerExclusions?: string | null;
 }
 export interface UrlsEntity {
   label: string;