diff --git a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
index 9ac41b4e..9558ff55 100644
--- a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
+++ b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
@@ -4,6 +4,7 @@ export default function getSlotFillFilter({ slot, libraryIds }) {
   if (!libraryIds) throw 'LibraryIds is required for getSlotFillFilter';
 
   let filter = {
+    fillSlots: true,
     removed: { $ne: true },
     $and: []
   };
diff --git a/app/imports/client/ui/properties/PropertyForm.vue b/app/imports/client/ui/properties/PropertyForm.vue
index 1852494a..f108e593 100644
--- a/app/imports/client/ui/properties/PropertyForm.vue
+++ b/app/imports/client/ui/properties/PropertyForm.vue
@@ -38,6 +38,28 @@
           v-if="context.isLibraryForm"
           dense
         >
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <smart-switch
+              label="Can fill slots"
+              :value="model.fillSlots"
+              :error-messages="errors.fillSlots"
+              @change="(value, ack) => $emit('change', {path: ['fillSlots'], value, ack})"
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <smart-switch
+              label="Searchable from character sheet"
+              :value="model.searchable"
+              :error-messages="errors.searchable"
+              @change="(value, ack) => $emit('change', {path: ['searchable'], value, ack})"
+            />
+          </v-col>
           <v-col
             cols="12"
             md="6"
diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index 5fe0b019..007b5b52 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -24,6 +24,7 @@ const LIBRARY_NODE_TREE_FIELDS = {
   slotFillerType: 1,
   slotFillerConditionNote: 1,
   slotFillerCondition: 1,
+  fillSlots: 1,
   searchable: 1,
   slotFillImage: 1,
   // Effect
diff --git a/app/imports/server/publications/searchLibraryNodes.js b/app/imports/server/publications/searchLibraryNodes.js
index 75750d33..062cfbbf 100644
--- a/app/imports/server/publications/searchLibraryNodes.js
+++ b/app/imports/server/publications/searchLibraryNodes.js
@@ -65,13 +65,12 @@ Meteor.publish('searchLibraryNodes', function (creatureId) {
     let filter = {
       'ancestors.id': { $in: libraryIds },
       removed: { $ne: true },
-      tags: { $ne: [] }, // Only tagged library nodes are considered
+      searchable: true //library nodes must opt-in
     };
     if (type) {
       filter.$or = [{
         type,
       }, {
-        type: 'slotFiller',
         slotFillerType: type,
       }];
     }