diff --git a/src/OptionsState.js b/src/OptionsState.js
index ffacbfa2..7dc65de4 100644
--- a/src/OptionsState.js
+++ b/src/OptionsState.js
@@ -1,4 +1,4 @@
-import Storage from "./lib/storage"
+import Storage from "./lib/sfjs/storageManager"
 
 export default class OptionsState {
 
diff --git a/src/Styles.js b/src/Styles.js
index 4b48a103..83ca74a6 100644
--- a/src/Styles.js
+++ b/src/Styles.js
@@ -1,10 +1,10 @@
 import { StyleSheet, StatusBar, Alert, Platform, Dimensions } from 'react-native';
 import App from "./app"
-import ModelManager from "./lib/modelManager"
-import Server from "./lib/server"
-import Sync from "./lib/sync"
-import Storage from "./lib/storage"
-import Auth from "./lib/auth"
+import ModelManager from "./lib/sfjs/modelManager"
+import Server from "./lib/sfjs/httpManager"
+import Sync from './lib/sfjs/syncManager'
+import Storage from "./lib/sfjs/storageManager"
+import Auth from "./lib/authManager"
 import Theme from "./models/subclass/theme"
 import KeysManager from './lib/keysManager'
 
@@ -22,56 +22,57 @@ export default class GlobalStyles {
 
   async resolveInitialTheme() {
     // Get the active theme from storage rather than waiting for local database to load
-    return Storage.get().getItem("activeTheme").then(function(themeResult) {
-      let runDefaultTheme = () => {
-        try {
-          var theme = this.systemTheme();
-          theme.setMobileActive(true);
-          this.activeTheme = theme;
-          var constants = this.defaultConstants();
-          this.setStyles(this.defaultRules(constants), constants, theme.getMobileRules().statusBar);
-        } catch (e) {
-          var constants = this.defaultConstants();
-          this.setStyles(this.defaultRules(constants), constants, Platform.OS == "android" ? "light-content" : "dark-content");
-          console.log("Default theme error", e);
-        }
+    var themeResult = await Storage.get().getItem("activeTheme");
+    let runDefaultTheme = () => {
+      try {
+        var theme = this.systemTheme();
+        theme.setMobileActive(true);
+        this.activeTheme = theme;
+        var constants = this.defaultConstants();
+        this.setStyles(this.defaultRules(constants), constants, theme.getMobileRules().statusBar);
+      } catch (e) {
+        var constants = this.defaultConstants();
+        this.setStyles(this.defaultRules(constants), constants, Platform.OS == "android" ? "light-content" : "dark-content");
+        console.log("Default theme error", e);
       }
+    }
 
-      if(themeResult) {
-        // JSON stringified content is generic and includes all items property at time of stringification
-        // So we parse it, then set content to itself, so that the mapping can be handled correctly.
-        try {
-          var parsedTheme = JSON.parse(themeResult);
-          var needsMigration = false;
-          if(parsedTheme.mobileRules) {
-            // Newer versions of the app persist a Theme object where mobileRules are nested in AppData.
-            // We want to check if the currently saved data is of the old format, which uses theme.mobileRules
-            // instead of theme.getMobileRules(). If so, we want to prepare it for the new format.
-            needsMigration = true;
-          }
-          let content = Object.assign({}, parsedTheme);
-          parsedTheme.content = content;
+    console.log("Theme result", themeResult);
 
-          var theme = new Theme(parsedTheme);
-          if(needsMigration) {
-            theme.setMobileRules(parsedTheme.mobileRules);
-            theme.mobileRules = null;
-          }
-
-          theme.isSwapIn = true;
-          var constants = _.merge(this.defaultConstants(), theme.getMobileRules().constants);
-          var rules = _.merge(this.defaultRules(constants), theme.getMobileRules().rules);
-          this.setStyles(rules, constants, theme.getMobileRules().statusBar);
-
-          this.activeTheme = theme;
-        } catch (e) {
-          console.error("Error parsing initial theme", e);
-          runDefaultTheme();
+    if(themeResult) {
+      // JSON stringified content is generic and includes all items property at time of stringification
+      // So we parse it, then set content to itself, so that the mapping can be handled correctly.
+      try {
+        var parsedTheme = JSON.parse(themeResult);
+        var needsMigration = false;
+        if(parsedTheme.mobileRules) {
+          // Newer versions of the app persist a Theme object where mobileRules are nested in AppData.
+          // We want to check if the currently saved data is of the old format, which uses theme.mobileRules
+          // instead of theme.getMobileRules(). If so, we want to prepare it for the new format.
+          needsMigration = true;
         }
-      } else {
+        let content = Object.assign({}, parsedTheme);
+        parsedTheme.content = content;
+
+        var theme = new Theme(parsedTheme);
+        if(needsMigration) {
+          theme.setMobileRules(parsedTheme.mobileRules);
+          theme.mobileRules = null;
+        }
+
+        theme.isSwapIn = true;
+        var constants = _.merge(this.defaultConstants(), theme.getMobileRules().constants);
+        var rules = _.merge(this.defaultRules(constants), theme.getMobileRules().rules);
+        this.setStyles(rules, constants, theme.getMobileRules().statusBar);
+
+        this.activeTheme = theme;
+      } catch (e) {
+        console.error("Error parsing initial theme", e);
         runDefaultTheme();
       }
-    }.bind(this));
+    } else {
+      runDefaultTheme();
+    }
   }
 
   constructor() {
@@ -136,9 +137,11 @@ export default class GlobalStyles {
     var constants = this.defaultConstants();
 
     this._systemTheme = new Theme({
-      name: "Default",
-      default: true,
-      uuid: 0
+      uuid: 0,
+      content: {
+        isDefault: true,
+        name: "Default",
+      }
     });
 
     this._systemTheme.setMobileRules({
@@ -175,7 +178,7 @@ export default class GlobalStyles {
       this.activeTheme = theme;
       theme.setMobileActive(true);
 
-      if(theme.default) {
+      if(theme.content.isDefault) {
         Storage.get().removeItem("activeTheme");
       } else if(writeToStorage) {
         Storage.get().setItem("activeTheme", JSON.stringify(theme));
@@ -258,9 +261,7 @@ export default class GlobalStyles {
   }
 
   setStyles(rules, constants, statusBar) {
-    if(!statusBar) {
-      statusBar = "light-content";
-    }
+    if(!statusBar) { statusBar = "light-content";}
     this.statusBar = statusBar;
     this.constants = constants;
     this.styles = {
diff --git a/src/app.js b/src/app.js
index c2fb770a..cdae9216 100644
--- a/src/app.js
+++ b/src/app.js
@@ -9,7 +9,7 @@ import {Navigation, ScreenVisibilityListener} from 'react-native-navigation';
 import {registerScreens} from './screens';
 
 import KeysManager from './lib/keysManager'
-import Auth from './lib/auth'
+import Auth from './lib/authManager'
 import ReviewManager from './lib/reviewManager';
 import GlobalStyles from "./Styles"
 import Icons from "./Icons"
diff --git a/src/containers/account/EncryptionSection.js b/src/containers/account/EncryptionSection.js
index 205898a9..37df6f00 100644
--- a/src/containers/account/EncryptionSection.js
+++ b/src/containers/account/EncryptionSection.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import GlobalStyles from "../../Styles"
 import {Text, View} from 'react-native';
 import KeysManager from "../../lib/keysManager"
-import ModelManager from "../../lib/modelManager"
+import ModelManager from "../../lib/sfjs/modelManager"
 
 import SectionHeader from "../../components/SectionHeader";
 import ButtonCell from "../../components/ButtonCell";
diff --git a/src/global.js b/src/global.js
index b957e968..1b59d331 100644
--- a/src/global.js
+++ b/src/global.js
@@ -18,7 +18,7 @@ global.SFAlertManager = SFAlertManager;
 global.SFStorageManager = SFStorageManager;
 global.SFHttpManager = SFHttpManager;
 
-import SF from "./lib/sfjs"
+import SF from "./lib/sfjs/sfjs"
 global.SFJS = SF.get();
 
 import 'sn-models';
diff --git a/src/lib/auth.js b/src/lib/authManager.js
similarity index 94%
rename from src/lib/auth.js
rename to src/lib/authManager.js
index 1aeb9a17..7aa1c790 100644
--- a/src/lib/auth.js
+++ b/src/lib/authManager.js
@@ -1,9 +1,10 @@
-import SF from './sfjs'
-import Server from './server'
-import Storage from './storage'
-import Sync from './sync'
-import ModelManager from './modelManager'
-import AlertManager from './alertManager'
+import SF from './sfjs/sfjs'
+import Server from './sfjs/httpManager'
+import Storage from './sfjs/storageManager'
+import Sync from './sfjs/syncManager'
+import ModelManager from './sfjs/modelManager'
+import AlertManager from './sfjs/alertManager'
+
 import {Platform} from 'react-native';
 import Keychain from "./keychain"
 import KeysManager from "./keysManager"
@@ -165,7 +166,7 @@ export default class Auth {
           return;
         }
 
-        SF.get().crypto().computeEncryptionKeysForUser(inputtedPassword, authParams).then((keys) => {
+        SF.get().crypto.computeEncryptionKeysForUser(inputtedPassword, authParams).then((keys) => {
           root.performLoginRequest(email, keys.pw, server, extraParams, async (response, error) => {
             if(error) {
               callback(null, error);
@@ -189,7 +190,7 @@ export default class Auth {
 
     // if(__DEV__) { authParams.pw_cost = 3000; }
 
-    SF.get().crypto().generateInitialKeysAndAuthParamsForUser(email, inputtedPassword).then((results) => {
+    SF.get().crypto.generateInitialKeysAndAuthParamsForUser(email, inputtedPassword).then((results) => {
       let keys = results.keys;
       let authParams = results.authParams;
 
diff --git a/src/lib/componentManager.js b/src/lib/componentManager.js
index 7a050d64..4a784b51 100644
--- a/src/lib/componentManager.js
+++ b/src/lib/componentManager.js
@@ -1,11 +1,11 @@
 /* This domain will be used to save context item client data */
 let ClientDataDomain = "org.standardnotes.sn.components";
 
-import ModelManager from './modelManager'
 import GlobalStyles from '../Styles'
 import App from '../app'
-import Sync from './sync'
-import SF from "./sfjs"
+import ModelManager from './sfjs/modelManager'
+import Sync from './sfjs/syncManager'
+import SF from "./sfjs/sfjs"
 
 export default class ComponentManager {
 
@@ -325,7 +325,7 @@ export default class ComponentManager {
     }
 
     component.window = componentWindow;
-    component.sessionKey = await SF.get().crypto().generateUUID();
+    component.sessionKey = await SF.get().crypto.generateUUID();
 
     this.sendMessageToComponent(component, {
       action: "component-registered",
diff --git a/src/lib/itemActionManager.js b/src/lib/itemActionManager.js
index e11606fb..94f33cbc 100644
--- a/src/lib/itemActionManager.js
+++ b/src/lib/itemActionManager.js
@@ -1,9 +1,8 @@
-import {Platform} from 'react-native';
-import AlertManager from './alertManager'
-import ModelManager from './modelManager'
-import Sync from './sync'
+import {Platform, Share} from 'react-native';
 import ApplicationState from '../ApplicationState'
-import {Share} from 'react-native';
+import AlertManager from './sfjs/alertManager'
+import ModelManager from './sfjs/modelManager'
+import Sync from './sfjs/syncManager'
 
 export default class ItemActionManager {
 
diff --git a/src/lib/keysManager.js b/src/lib/keysManager.js
index b4833f83..a7e6b853 100644
--- a/src/lib/keysManager.js
+++ b/src/lib/keysManager.js
@@ -1,14 +1,14 @@
-import SF from './sfjs'
-import Server from './server'
-import Storage from './storage'
-import ModelManager from './modelManager'
 import {Platform} from 'react-native';
-import Keychain from "./keychain"
-import FlagSecure from 'react-native-flag-secure-android';
 import App from "../app"
+import FlagSecure from 'react-native-flag-secure-android';
 import ApplicationState from "../ApplicationState"
 import FingerprintScanner from 'react-native-fingerprint-scanner';
 
+import SF from './sfjs/sfjs'
+import ModelManager from './sfjs/modelManager'
+import Storage from './sfjs/storageManager'
+import Keychain from "./keychain"
+
 let OfflineParamsKey = "pc_params";
 let FirstRunKey = "first_run";
 let StorageEncryptionKey = "storage_encryption";
diff --git a/src/lib/reviewManager.js b/src/lib/reviewManager.js
index eb3a3936..d298cc8d 100644
--- a/src/lib/reviewManager.js
+++ b/src/lib/reviewManager.js
@@ -1,6 +1,6 @@
-import * as StoreReview from 'react-native-store-review';
 import {Platform} from 'react-native';
-import Storage from "./storage";
+import * as StoreReview from 'react-native-store-review';
+import Storage from "./sfjs/storageManager";
 
 let NumRunsBeforeAskingForReview = [20, 65, 120]
 
diff --git a/src/lib/alertManager.js b/src/lib/sfjs/alertManager.js
similarity index 95%
rename from src/lib/alertManager.js
rename to src/lib/sfjs/alertManager.js
index e85263d7..7a5d50be 100644
--- a/src/lib/alertManager.js
+++ b/src/lib/sfjs/alertManager.js
@@ -1,5 +1,5 @@
 import { Alert } from 'react-native';
-import App from "../app"
+import App from "../../app"
 
 export default class AlertManager extends SFAlertManager {
 
diff --git a/src/lib/server.js b/src/lib/sfjs/httpManager.js
similarity index 89%
rename from src/lib/server.js
rename to src/lib/sfjs/httpManager.js
index 2f520123..3368f3c3 100644
--- a/src/lib/server.js
+++ b/src/lib/sfjs/httpManager.js
@@ -1,4 +1,4 @@
-import KeysManager from './keysManager'
+import KeysManager from '../keysManager'
 
 export default class Server extends SFHttpManager {
 
diff --git a/src/lib/modelManager.js b/src/lib/sfjs/modelManager.js
similarity index 93%
rename from src/lib/modelManager.js
rename to src/lib/sfjs/modelManager.js
index 636078d1..110402dc 100644
--- a/src/lib/modelManager.js
+++ b/src/lib/sfjs/modelManager.js
@@ -1,17 +1,12 @@
-import Storage from "./storage"
-import Theme from "../models/subclass/theme"
-import "../models/extend/item.js";
+import Storage from "./storageManager"
+import Theme from "../../models/subclass/theme"
+import "../../models/extend/item.js";
 
 SFModelManager.ContentTypeClassMapping = {
   "Note" : SNNote,
   "Tag" : SNTag,
-  "SN|SmartTag" : SNSmartTag,
-  "Extension" : SNExtension,
-  "SN|Editor" : SNEditor,
   "SN|Theme" : Theme,
-  "SN|Component" : SNComponent,
-  "SF|Extension" : SNServerExtension,
-  "SF|MFA" : SNMfa
+  "SN|Component" : SNComponent
 };
 
 SFItem.AppDomain = "org.standardnotes.sn";
diff --git a/src/lib/sfjs.js b/src/lib/sfjs/sfjs.js
similarity index 100%
rename from src/lib/sfjs.js
rename to src/lib/sfjs/sfjs.js
diff --git a/src/lib/storage.js b/src/lib/sfjs/storageManager.js
similarity index 97%
rename from src/lib/storage.js
rename to src/lib/sfjs/storageManager.js
index a6df10f7..541539f2 100644
--- a/src/lib/storage.js
+++ b/src/lib/sfjs/storageManager.js
@@ -102,7 +102,9 @@ export default class Storage extends SFStorageManager {
       return;
     }
 
+
     return Promise.all(items.map((item) => {
+      console.log("Saving model", JSON.stringify(item));
       return AsyncStorage.setItem(this.keyForItem(item), JSON.stringify(item));
     }));
   }
diff --git a/src/lib/sync.js b/src/lib/sfjs/syncManager.js
similarity index 86%
rename from src/lib/sync.js
rename to src/lib/sfjs/syncManager.js
index 986ee252..6c4969c1 100644
--- a/src/lib/sync.js
+++ b/src/lib/sfjs/syncManager.js
@@ -1,11 +1,12 @@
 import SF from './sfjs'
-import Server from './server'
-import Auth from './auth'
+import Server from './httpManager'
 import ModelManager from './modelManager'
-import Storage from './storage'
-import KeysManager from './keysManager'
+import Storage from './storageManager'
 import AlertManager from './alertManager'
 
+import Auth from '../authManager'
+import KeysManager from '../keysManager'
+
 export default class Sync extends SFSyncManager {
 
   static instance = null;
@@ -23,6 +24,7 @@ export default class Sync extends SFSyncManager {
     KeysManager.get().registerAccountRelatedStorageKeys(["syncToken", "cursorToken"]);
 
     this.setKeyRequestHandler((request) => {
+      console.log(request);
       var keys;
       if(request == SFSyncManager.KeyRequestLoadSaveAccount || request == SFSyncManager.KeyRequestLoadLocal) {
         keys = KeysManager.get().activeKeys();
@@ -40,7 +42,7 @@ export default class Sync extends SFSyncManager {
 
   async resaveOfflineData() {
     var items = ModelManager.get().allItems;
-    return this.writeItemsToStorage(items, false);
+    return this.writeItemsToLocalStorage(items, false);
   }
 
   async getServerURL() {
diff --git a/src/models/subclass/theme.js b/src/models/subclass/theme.js
index 1e7fe1bb..4c58e4bc 100644
--- a/src/models/subclass/theme.js
+++ b/src/models/subclass/theme.js
@@ -1,4 +1,4 @@
-import SF from "../../lib/sfjs"
+import SF from "../../lib/sfjs/sfjs"
 
 export default class Theme extends SNTheme {
 
diff --git a/src/screens/Account.js b/src/screens/Account.js
index c347632d..78bd2ec4 100644
--- a/src/screens/Account.js
+++ b/src/screens/Account.js
@@ -1,11 +1,13 @@
 import React, { Component } from 'react';
 import {ScrollView, View, Alert, Keyboard, Linking, Platform, Share, NativeModules} from 'react-native';
 
-import Sync from '../lib/sync'
-import Auth from '../lib/auth'
-import AlertManager from '../lib/alertManager'
+import Sync from '../lib/sfjs/syncManager'
+import ModelManager from '../lib/sfjs/modelManager'
+import AlertManager from '../lib/sfjs/alertManager'
+
+import Auth from '../lib/authManager'
 import KeysManager from '../lib/keysManager'
-import ModelManager from '../lib/modelManager'
+
 import SectionHeader from "../components/SectionHeader";
 import ButtonCell from "../components/ButtonCell";
 import TableSection from "../components/TableSection";
diff --git a/src/screens/Authenticate.js b/src/screens/Authenticate.js
index 20fee0d8..29e038ad 100644
--- a/src/screens/Authenticate.js
+++ b/src/screens/Authenticate.js
@@ -1,17 +1,18 @@
 import React, { Component } from 'react';
-import Auth from '../lib/auth'
-import SF from '../lib/sfjs'
+import App from "../app"
+import SF from '../lib/sfjs/sfjs'
+import Storage from '../lib/sfjs/storageManager'
+import Auth from '../lib/authManager'
+import KeysManager from '../lib/keysManager'
+
+import Abstract from "./Abstract"
 import SectionHeader from "../components/SectionHeader";
 import ButtonCell from "../components/ButtonCell";
 import TableSection from "../components/TableSection";
 import SectionedTableCell from "../components/SectionedTableCell";
 import SectionedAccessoryTableCell from "../components/SectionedAccessoryTableCell";
 import SectionedOptionsTableCell from "../components/SectionedOptionsTableCell";
-import Abstract from "./Abstract"
-import Storage from '../lib/storage'
-import KeysManager from '../lib/keysManager'
 import GlobalStyles from "../Styles"
-import App from "../app"
 import FingerprintScanner from 'react-native-fingerprint-scanner';
 import Icon from 'react-native-vector-icons/Ionicons';
 
@@ -224,9 +225,9 @@ class PasscodeSection extends Abstract {
 
       // Allow UI to update before executing block task. InteractionManager.runAfterInteractions doesn't seem to work.
       setTimeout(async () => {
-        let identifier = await SF.get().crypto().generateUUID();
+        let identifier = await SF.get().crypto.generateUUID();
 
-        SF.get().crypto().generateInitialKeysAndAuthParamsForUser(identifier, passcode).then((results) => {
+        SF.get().crypto.generateInitialKeysAndAuthParamsForUser(identifier, passcode).then((results) => {
           let keys = results.keys;
           let authParams = results.authParams;
 
@@ -263,7 +264,7 @@ class PasscodeSection extends Abstract {
       setTimeout(() => {
 
          var authParams = KeysManager.get().offlineAuthParams;
-         SF.get().crypto().computeEncryptionKeysForUser(passcode, authParams).then((keys) => {
+         SF.get().crypto.computeEncryptionKeysForUser(passcode, authParams).then((keys) => {
            if(keys.pw === KeysManager.get().offlinePasscodeHash()) {
              KeysManager.get().setOfflineKeys(keys);
              this.props.onAuthenticateSuccess();
diff --git a/src/screens/Compose.js b/src/screens/Compose.js
index b5e86e3c..22e985f7 100644
--- a/src/screens/Compose.js
+++ b/src/screens/Compose.js
@@ -1,11 +1,12 @@
 import React, { Component } from 'react';
-import Sync from '../lib/sync'
-import Auth from '../lib/auth'
-import ModelManager from '../lib/modelManager'
-import ComponentManager from '../lib/componentManager'
-import Abstract from "./Abstract"
-import Icons from '../Icons';
 import App from '../app'
+import Sync from '../lib/sfjs/syncManager'
+import ModelManager from '../lib/sfjs/modelManager'
+import Auth from '../lib/authManager'
+
+import Abstract from "./Abstract"
+import ComponentManager from '../lib/componentManager'
+import Icons from '../Icons';
 import LockedView from "../containers/LockedView";
 import Icon from 'react-native-vector-icons/Ionicons';
 
@@ -202,7 +203,7 @@ export default class Compose extends Abstract {
         onOptionsChange: (options) => {
           if(!_.isEqual(options.selectedTags, this.previousOptions.selectedTags)) {
             var tags = ModelManager.get().findItems(options.selectedTags);
-            this.note.replaceTags(tags);
+            this.replaceTagsForNote(tags);
             this.note.setDirty(true);
             this.changesMade();
           }
@@ -211,6 +212,26 @@ export default class Compose extends Abstract {
     });
   }
 
+  replaceTagsForNote(newTags) {
+    let note = this.note;
+
+    var oldTags = note.tags.slice(); // original array will be modified in the for loop so we make a copy
+    for(var oldTag of oldTags) {
+      if(!newTags.includes(oldTag)) {
+        oldTag.removeItemAsRelationship(note);
+        oldTag.setDirty(true);
+        note.removeItemAsRelationship(oldTag);
+      }
+    }
+
+    for(var newTag of newTags) {
+      newTag.setDirty(true);
+      newTag.addItemAsRelationship(note);
+    }
+
+    note.tags = newTags;
+  }
+
   onTitleChange = (text) => {
     this.mergeState({title: text})
     this.note.title = text;
diff --git a/src/screens/Filter.js b/src/screens/Filter.js
index 8c419091..bb22412a 100644
--- a/src/screens/Filter.js
+++ b/src/screens/Filter.js
@@ -1,9 +1,10 @@
 import React, { Component } from 'react';
 import { TextInput, SectionList, ScrollView, View, Text, Linking, Share, Platform, StatusBar, FlatList, Dimensions } from 'react-native';
-import Sync from '../lib/sync'
-import ModelManager from '../lib/modelManager'
+import App from "../app"
+import Sync from '../lib/sfjs/syncManager'
+import ModelManager from '../lib/sfjs/modelManager'
 import ComponentManager from '../lib/componentManager'
-import AlertManager from '../lib/alertManager'
+import AlertManager from '../lib/sfjs/alertManager'
 import ItemActionManager from '../lib/itemActionManager'
 import SectionHeader from "../components/SectionHeader";
 import ButtonCell from "../components/ButtonCell";
@@ -15,7 +16,6 @@ import Abstract from "./Abstract"
 import Icons from '../Icons';
 import OptionsState from "../OptionsState"
 import GlobalStyles from "../Styles"
-import App from "../app"
 import ApplicationState from "../ApplicationState";
 import ActionSheet from 'react-native-actionsheet'
 
@@ -52,19 +52,30 @@ export default class Filter extends Abstract {
     // then wait a little to render the rest, such as a dynamic list of tags
     // See https://github.com/wix/react-native-navigation/issues/358
 
-    this.syncEventHandler = Sync.get().addEventHandler((event, data) => {
-      if(event == "local-data-loaded") {
-        if(!this.props.singleSelectMode) {
-          // Load tags after delay
-          setTimeout(function () {
-            this.loadTags = true;
-            this.forceUpdate();
-          }.bind(this), 10);
-        } else {
-          // Load tags immediately on every render
+    let handleInitialDataLoad = () => {
+      if(this.handledDataLoad) { return; }
+      this.handledDataLoad = true;
+
+      if(!this.props.singleSelectMode) {
+        // Load tags after delay
+        setTimeout(function () {
           this.loadTags = true;
           this.forceUpdate();
-        }
+        }.bind(this), 10);
+      } else {
+        // Load tags immediately on every render
+        this.loadTags = true;
+        this.forceUpdate();
+      }
+    }
+
+    if(Sync.get().initialDataLoaded()) {
+      handleInitialDataLoad();
+    }
+
+    this.syncEventHandler = Sync.get().addEventHandler((event, data) => {
+      if(event == "local-data-loaded") {
+        handleInitialDataLoad();
       }
 
       else if(event == "sync:completed") {
@@ -196,7 +207,7 @@ export default class Filter extends Abstract {
   }
 
   createTag(text, callback) {
-    var tag = new SNTag({title: text});
+    var tag = new SNTag({content: {title: text}});
     tag.initUUID().then(() => {
       tag.setDirty(true);
       ModelManager.get().addItem(tag);
diff --git a/src/screens/Notes.js b/src/screens/Notes.js
index 935b5049..6cd2aa27 100644
--- a/src/screens/Notes.js
+++ b/src/screens/Notes.js
@@ -1,18 +1,21 @@
 import React, { Component } from 'react';
 import { StyleSheet, View, Platform, Text, StatusBar, Modal, Alert } from 'react-native';
-import ModelManager from '../lib/modelManager'
-import Storage from '../lib/storage'
-import Sync from '../lib/sync'
-import Auth from '../lib/auth'
+
+import App from "../app"
+import ModelManager from '../lib/sfjs/modelManager'
+import Storage from '../lib/sfjs/storageManager'
+import Sync from '../lib/sfjs/syncManager'
+import AlertManager from '../lib/sfjs/alertManager'
+
+import Auth from '../lib/authManager'
 import KeysManager from '../lib/keysManager'
-import AlertManager from '../lib/alertManager'
-import GlobalStyles from "../Styles"
 import Keychain from "../lib/keychain"
+
+import Abstract from "./Abstract"
+import GlobalStyles from "../Styles"
 import Icons from '../Icons';
 import NoteList from "../containers/NoteList"
-import Abstract from "./Abstract"
 import OptionsState from "../OptionsState"
-import App from "../app"
 import AuthModal from "../containers/AuthModal"
 import LockedView from "../containers/LockedView"
 import ApplicationState from "../ApplicationState";
diff --git a/src/screens/Webview.js b/src/screens/Webview.js
index 710d0785..49c836c2 100644
--- a/src/screens/Webview.js
+++ b/src/screens/Webview.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import App from '../app'
 import ComponentManager from '../lib/componentManager'
-import ModelManager from '../lib/modelManager'
+import ModelManager from '../lib/sfjs/modelManager'
 import TableSection from "../components/TableSection";
 import Icons from '../Icons';
 import LockedView from "../containers/LockedView";
diff --git a/src/screens/index.js b/src/screens/index.js
index f497bde5..a4a1dcac 100644
--- a/src/screens/index.js
+++ b/src/screens/index.js
@@ -6,7 +6,7 @@ import Account from './Account'
 import Authenticate from './Authenticate'
 import Filter from './Filter'
 import InputModal from './InputModal'
-import Sync from '../lib/sync'
+import Sync from '../lib/sfjs/syncManager'
 import Webview from './Webview'
 
 export function registerScreens() {