diff --git a/browser/finder/NoteDetail.js b/browser/finder/NoteDetail.js
index 98460b48..3652017c 100644
--- a/browser/finder/NoteDetail.js
+++ b/browser/finder/NoteDetail.js
@@ -115,6 +115,7 @@ class NoteDetail extends React.Component {
           </button>
         </div>
       })
+
       let viewList = note.snippets.map((snippet, index) => {
         let isActive = this.state.snippetIndex === index
         let mode = snippet.mode === 'text'
@@ -133,7 +134,7 @@ class NoteDetail extends React.Component {
             />
             <button styleName='tabView-top-mode'
             >
-              {mode == null ? null : mode}
+              {mode == null ? null : mode.mode}
             </button>
           </div>
           {snippet.mode === 'markdown'
diff --git a/browser/finder/NoteList.js b/browser/finder/NoteList.js
index 7087eb53..30d0163a 100644
--- a/browser/finder/NoteList.js
+++ b/browser/finder/NoteList.js
@@ -54,12 +54,12 @@ class NoteList extends React.Component {
   }
 
   render () {
-    let { storages, notes, index } = this.props
+    let { storageMap, notes, index } = this.props
 
     let notesList = notes
       .slice(0, 10 + 10 * this.state.range)
       .map((note, _index) => {
-        let storage = _.find(storages, {key: note.storage})
+        let storage = storageMap[note.storage]
         let folder = _.find(storage.folders, {key: note.folder})
         return (
           <NoteItem
diff --git a/browser/finder/index.js b/browser/finder/index.js
index 1f4d1121..c8161b84 100644
--- a/browser/finder/index.js
+++ b/browser/finder/index.js
@@ -217,33 +217,51 @@ class FinderMain extends React.Component {
   }
 
   render () {
-    let { storages, notes, config } = this.props
+    let { data, config } = this.props
     let { filter, search } = this.state
-    let storageList = storages
-      .map((storage) => <StorageSection
-        filter={filter}
-        storage={storage}
-        key={storage.key}
-        handleStorageButtonClick={(e, storage) => this.handleStorageButtonClick(e, storage)}
-        handleFolderButtonClick={(e, storage, folder) => this.handleFolderButtonClick(e, storage, folder)}
-      />)
+    let storageList = []
+    for (let key in data.storageMap) {
+      let storage = data.storageMap[key]
+      let item = (
+        <StorageSection
+          filter={filter}
+          storage={storage}
+          key={storage.key}
+          handleStorageButtonClick={(e, storage) => this.handleStorageButtonClick(e, storage)}
+          handleFolderButtonClick={(e, storage, folder) => this.handleFolderButtonClick(e, storage, folder)}
+        />
+      )
+      storageList.push(item)
+    }
+    let notes = []
+    let noteIds
+
+    switch (filter.type) {
+      case 'STORAGE':
+        noteIds = data.storageNoteMap[filter.storage]
+        break
+      case 'FOLDER':
+        noteIds = data.folderNoteMap[filter.storage + '-' + filter.folder]
+        break
+      case 'STARRED':
+        noteIds = data.starredSet
+    }
+    if (noteIds != null) {
+      noteIds.forEach((id) => {
+        notes.push(data.noteMap[id])
+      })
+    } else {
+      for (let key in data.noteMap) {
+        notes.push(data.noteMap[key])
+      }
+    }
+
     if (!filter.includeSnippet && filter.includeMarkdown) {
       notes = notes.filter((note) => note.type === 'MARKDOWN_NOTE')
     } else if (filter.includeSnippet && !filter.includeMarkdown) {
       notes = notes.filter((note) => note.type === 'SNIPPET_NOTE')
     }
 
-    switch (filter.type) {
-      case 'STORAGE':
-        notes = notes.filter((note) => note.storage === filter.storage)
-        break
-      case 'FOLDER':
-        notes = notes.filter((note) => note.storage === filter.storage && note.folder === filter.folder)
-        break
-      case 'STARRED':
-        notes = notes.filter((note) => note.isStarred)
-    }
-
     if (search.trim().length > 0) {
       let needle = new RegExp(_.escapeRegExp(search.trim()), 'i')
       notes = notes.filter((note) => note.title.match(needle))
@@ -302,7 +320,7 @@ class FinderMain extends React.Component {
             </div>
           </div>
           <NoteList styleName='result-list'
-            storages={storages}
+            storageMap={data.storageMap}
             notes={notes}
             ref='list'
             search={search}
@@ -323,14 +341,6 @@ class FinderMain extends React.Component {
 }
 
 FinderMain.propTypes = {
-  articles: PropTypes.array,
-  activeArticle: PropTypes.shape({
-    key: PropTypes.string,
-    tags: PropTypes.array,
-    title: PropTypes.string,
-    content: PropTypes.string
-  }),
-  status: PropTypes.shape(),
   dispatch: PropTypes.func
 }
 
diff --git a/browser/finder/ipcClient.js b/browser/finder/ipcClient.js
index 7684f180..e9804258 100644
--- a/browser/finder/ipcClient.js
+++ b/browser/finder/ipcClient.js
@@ -75,8 +75,7 @@ nodeIpc.connectTo(
       console.log('Received data from Main renderer')
       store.default.dispatch({
         type: 'THROTTLE_DATA',
-        storages: payload.storages,
-        notes: payload.notes
+        data: payload
       })
     })
 
diff --git a/browser/finder/store.js b/browser/finder/store.js
index c2bf7ac4..ab4a0884 100644
--- a/browser/finder/store.js
+++ b/browser/finder/store.js
@@ -30,17 +30,20 @@ const defaultConfig = {
   }
 }
 
-function storages (state = [], action) {
-  switch (action.type) {
-    case 'THROTTLE_DATA':
-      state = action.storages
-  }
-  return state
+let defaultData = {
+  storageMap: {},
+  noteMap: {},
+  starredSet: [],
+  storageNoteMap: {},
+  folderNoteMap: {},
+  tagNoteMap: {}
 }
-function notes (state = [], action) {
+
+function data (state = defaultData, action) {
   switch (action.type) {
     case 'THROTTLE_DATA':
-      state = action.notes
+      console.log(action)
+      state = action.data
   }
   return state
 }
@@ -66,8 +69,7 @@ function config (state = defaultConfig, action) {
 }
 
 let reducer = combineReducers({
-  storages,
-  notes,
+  data,
   config,
   routing: routerReducer
 })
diff --git a/browser/lib/Mutable.js b/browser/lib/Mutable.js
index 7a307139..c7aa213d 100644
--- a/browser/lib/Mutable.js
+++ b/browser/lib/Mutable.js
@@ -38,15 +38,22 @@ class MutableMap {
     }
     return result
   }
+
+  toJS () {
+    let result = {}
+    for (let [key, value] of this._map) {
+      if (value instanceof MutableSet || value instanceof MutableMap) {
+        value = value.toJS()
+      }
+      result[key] = value
+    }
+    return result
+  }
 }
 
 class MutableSet {
   constructor (iterable) {
-    if (iterable instanceof MutableSet) {
-      this._set = new Set(iterable._set)
-    } else {
-      this._set = new Set(iterable)
-    }
+    this._set = new Set(iterable)
   }
 
   add (...args) {
diff --git a/browser/main/lib/ipcClient.js b/browser/main/lib/ipcClient.js
index d928ed99..12acfed2 100644
--- a/browser/main/lib/ipcClient.js
+++ b/browser/main/lib/ipcClient.js
@@ -27,10 +27,15 @@ nodeIpc.connectTo(
 
     nodeIpc.of.node.on('request-data-from-finder', function () {
       console.log('throttle')
-      var data = store.getState()
+      var { data } = store.getState()
+      console.log(data.starredSet.toJS())
       nodeIpc.of.node.emit('throttle-data', {
-        storages: data.storages,
-        notes: data.notes
+        storageMap: data.storageMap.toJS(),
+        noteMap: data.noteMap.toJS(),
+        starredSet: data.starredSet.toJS(),
+        storageNoteMap: data.storageNoteMap.toJS(),
+        folderNoteMap: data.folderNoteMap.toJS(),
+        tagNoteMap: data.tagNoteMap.toJS()
       })
     })
   }