diff --git a/apps/opencs/view/filter/filtercreator.cpp b/apps/opencs/view/filter/filtercreator.cpp
index 640c9fe78..5bca0434b 100644
--- a/apps/opencs/view/filter/filtercreator.cpp
+++ b/apps/opencs/view/filter/filtercreator.cpp
@@ -56,7 +56,7 @@ CSVFilter::FilterCreator::FilterCreator (CSMWorld::Data& data, QUndoStack& undoS
     /// \todo re-enable for OpenMW 1.1
     // mScope->addItem ("Content");
 
-    connect (mScope, SIGNAL (currentIndexChanged (int)), this, SLOT (setScope (int)));
+    connect (mScope, SIGNAL (currentIndexChanged (int)), this, SLOT (setScope2 (int)));
 
     insertAtBeginning (mScope, false);
 
@@ -71,7 +71,7 @@ void CSVFilter::FilterCreator::reset()
     GenericCreator::reset();
 }
 
-void CSVFilter::FilterCreator::setScope (int index)
+void CSVFilter::FilterCreator::setScope2 (int index)
 {
     update();
 }
diff --git a/apps/opencs/view/filter/filtercreator.hpp b/apps/opencs/view/filter/filtercreator.hpp
index 437d01c8d..144b5adf4 100644
--- a/apps/opencs/view/filter/filtercreator.hpp
+++ b/apps/opencs/view/filter/filtercreator.hpp
@@ -36,7 +36,7 @@ namespace CSVFilter
 
         private slots:
 
-            void setScope (int index);
+            void setScope2 (int index);
     };
 }
 
diff --git a/apps/opencs/view/world/creator.cpp b/apps/opencs/view/world/creator.cpp
index d753a2b47..a24c58e54 100644
--- a/apps/opencs/view/world/creator.cpp
+++ b/apps/opencs/view/world/creator.cpp
@@ -1,7 +1,16 @@
 
 #include "creator.hpp"
 
-CSVWorld::Creator:: ~Creator() {}
+#include <stdexcept>
+
+CSVWorld::Creator::~Creator() {}
+
+void CSVWorld::Creator::setScope (unsigned int scope)
+{
+    if (scope!=CSMWorld::Scope_Content)
+        throw std::logic_error ("Invalid scope in creator");
+}
+
 
 CSVWorld::CreatorFactoryBase::~CreatorFactoryBase() {}
 
diff --git a/apps/opencs/view/world/creator.hpp b/apps/opencs/view/world/creator.hpp
index 88da70330..8e50e8715 100644
--- a/apps/opencs/view/world/creator.hpp
+++ b/apps/opencs/view/world/creator.hpp
@@ -1,9 +1,14 @@
 #ifndef CSV_WORLD_CREATOR_H
 #define CSV_WORLD_CREATOR_H
 
+#include <memory>
+
 #include <QWidget>
+
 #include "../../model/world/universalid.hpp"
 
+#include "../../model/world/scope.hpp"
+
 class QUndoStack;
 
 namespace CSMWorld
@@ -32,6 +37,9 @@ namespace CSVWorld
 
             virtual void toggleWidgets(bool active = true) = 0;
 
+            /// Default implementation: Throw an exception if scope!=Scope_Content.
+            virtual void setScope (unsigned int scope);
+
         signals:
 
             void done();
@@ -68,7 +76,7 @@ namespace CSVWorld
             /// \note The function always returns 0.
     };
 
-    template<class CreatorT>
+    template<class CreatorT, unsigned int scope = CSMWorld::Scope_Content>
     class CreatorFactory : public CreatorFactoryBase
     {
         public:
@@ -81,11 +89,15 @@ namespace CSVWorld
             /// records should be provided.
     };
 
-    template<class CreatorT>
-    Creator *CreatorFactory<CreatorT>::makeCreator (CSMWorld::Data& data, QUndoStack& undoStack,
+    template<class CreatorT, unsigned int scope>
+    Creator *CreatorFactory<CreatorT, scope>::makeCreator (CSMWorld::Data& data, QUndoStack& undoStack,
         const CSMWorld::UniversalId& id) const
     {
-        return new CreatorT (data, undoStack, id);
+        std::auto_ptr<CreatorT> creator (new CreatorT (data, undoStack, id));
+
+        creator->setScope (scope);
+
+        return creator.release();
     }
 }