diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index b9f6c6cf9..f9cf32a4c 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -280,17 +280,17 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
         UniversalId::Type_Referenceable);
     addModel (new IdTable (&mRefs, IdTable::Feature_ViewCell | IdTable::Feature_Preview), UniversalId::Type_Reference);
     addModel (new IdTable (&mFilters), UniversalId::Type_Filter);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Mesh)),
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Meshes)),
         UniversalId::Type_Mesh);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Icon)),
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Icons)),
         UniversalId::Type_Icon);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Music)),
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Musics)),
         UniversalId::Type_Music);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_SoundRes)),
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_SoundsRes)),
         UniversalId::Type_SoundRes);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Texture)),
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Textures)),
         UniversalId::Type_Texture);
-    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Video)),
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Videos)),
         UniversalId::Type_Video);
 }
 
@@ -515,7 +515,7 @@ CSMWorld::IdCollection<ESM::BodyPart>& CSMWorld::Data::getBodyParts()
 
 const CSMWorld::Resources& CSMWorld::Data::getResources (const UniversalId& id) const
 {
-    return mResourcesManager.get (UniversalId::getParentType (id.getType()));
+    return mResourcesManager.get (id.getType());
 }
 
 QAbstractItemModel *CSMWorld::Data::getTableModel (const CSMWorld::UniversalId& id)
diff --git a/apps/opencs/model/world/resourcesmanager.cpp b/apps/opencs/model/world/resourcesmanager.cpp
index 5692d30ac..ec6746521 100644
--- a/apps/opencs/model/world/resourcesmanager.cpp
+++ b/apps/opencs/model/world/resourcesmanager.cpp
@@ -12,12 +12,12 @@ void CSMWorld::ResourcesManager::listResources()
 {
     static const char * const sMeshTypes[] = { "nif", 0 };
 
-    addResources (Resources ("meshes", UniversalId::Type_Mesh, sMeshTypes));
-    addResources (Resources ("icons", UniversalId::Type_Icon));
-    addResources (Resources ("music", UniversalId::Type_Music));
-    addResources (Resources ("sound", UniversalId::Type_SoundRes));
-    addResources (Resources ("textures", UniversalId::Type_Texture));
-    addResources (Resources ("videos", UniversalId::Type_Video));
+    addResources (Resources ("meshes", UniversalId::Type_Meshes, sMeshTypes));
+    addResources (Resources ("icons", UniversalId::Type_Icons));
+    addResources (Resources ("music", UniversalId::Type_Musics));
+    addResources (Resources ("sound", UniversalId::Type_SoundsRes));
+    addResources (Resources ("textures", UniversalId::Type_Textures));
+    addResources (Resources ("videos", UniversalId::Type_Videos));
 }
 
 const CSMWorld::Resources& CSMWorld::ResourcesManager::get (UniversalId::Type type) const