diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index b0de7a5b..dffc5053 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -661,7 +661,7 @@ const MopidyMiddleware = (function(){
              * ======================================================================================
              **/
 
-            case 'MOPIDY_DIRECTORY':
+            case 'MOPIDY_GET_DIRECTORY':
                 store.dispatch({ type: 'MOPIDY_DIRECTORY_LOADED', data: false });
                 instruct( socket, store, 'library.browse', action.data )
                     .then( response => {                    
diff --git a/src/js/services/mopidy/reducer.js b/src/js/services/mopidy/reducer.js
index d1d1837a..af55520f 100755
--- a/src/js/services/mopidy/reducer.js
+++ b/src/js/services/mopidy/reducer.js
@@ -72,21 +72,6 @@ export default function reducer(mopidy = {}, action){
                 directory: action.data   
             });
 
-        case 'MOPIDY_PLAYLIST_LOADED':
-            return Object.assign({}, mopidy, {
-                playlist: action.data
-            });
-
-        case 'MOPIDY_ARTISTS_LOADED':
-            return Object.assign({}, mopidy, {
-                artists: action.data
-            });
-
-        case 'MOPIDY_ALBUMS_LOADED':
-            return Object.assign({}, mopidy, {
-                albums: action.data
-            });
-
         default:
             return mopidy
     }
diff --git a/src/js/views/library/LibraryLocalDirectory.js b/src/js/views/library/LibraryLocalDirectory.js
index b22d6d29..c92d8026 100755
--- a/src/js/views/library/LibraryLocalDirectory.js
+++ b/src/js/views/library/LibraryLocalDirectory.js
@@ -38,7 +38,7 @@ class LibraryLocalDirectory extends React.Component{
 
 	loadDirectory( props = this.props ){
 		if( props.mopidy_connected ){
-			this.props.mopidyActions.getDirectory( props.params.uri );
+			this.props.mopidyActions.getDirectory( props.params.uri.replace('|','?') );
 		}
 	}
 
@@ -50,7 +50,13 @@ class LibraryLocalDirectory extends React.Component{
 			if (directory[i].type && directory[i].type == 'track') {
 				tracks.push( directory[i] )
 			} else {
-				folders.push( directory[i] )
+				folders.push(Object.assign(
+					{},
+					directory[i],
+					{
+						uri: directory[i].uri.replace('?','|')
+					}
+				))
 			}
 		}