diff --git a/server/data/wikidata/queries/editions_reverse_claims.coffee b/server/data/wikidata/queries/editions_reverse_claims.coffee
index 0420149d68..2cb2015b0b 100644
--- a/server/data/wikidata/queries/editions_reverse_claims.coffee
+++ b/server/data/wikidata/queries/editions_reverse_claims.coffee
@@ -7,7 +7,10 @@ module.exports =
       ?item wdt:#{pid} wd:#{qid} .
       ?item wdt:P31 wd:Q3331189 .
       # Filter-out entities tagged as both work and edition
-      FILTER NOT EXISTS { ?item wdt:P31 wd:Q571 }
+      FILTER NOT EXISTS {
+        ?item wdt:P31 ?work_type
+        VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
+      }
     }
     LIMIT 1000
     """
diff --git a/server/data/wikidata/queries/humans_reverse_claims.coffee b/server/data/wikidata/queries/humans_reverse_claims.coffee
index fae13ddaaa..03116f22e0 100644
--- a/server/data/wikidata/queries/humans_reverse_claims.coffee
+++ b/server/data/wikidata/queries/humans_reverse_claims.coffee
@@ -9,16 +9,8 @@ module.exports =
 
       # Keep only humans that are known for at least one work
       ?work wdt:P50 ?item .
-      # book
-      { ?work wdt:P31 wd:Q571 . }
-      # literary work
-      UNION { ?work wdt:P31 wd:Q7725634 . }
-      # comic book album
-      UNION { ?work wdt:P31 wd:Q2831984 . }
-      # comic book
-      UNION { ?work wdt:P31 wd:Q1004 . }
-      # manga
-      UNION { ?work wdt:P31 wd:Q8274 . }
+      ?work wdt:P31 ?work_type .
+      VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
     }
     LIMIT 1000
     """
diff --git a/server/data/wikidata/queries/serie_parts.coffee b/server/data/wikidata/queries/serie_parts.coffee
index 7b72aabe43..e3da0bda99 100644
--- a/server/data/wikidata/queries/serie_parts.coffee
+++ b/server/data/wikidata/queries/serie_parts.coffee
@@ -19,8 +19,8 @@ module.exports =
         ?part wdt:P31 wd:Q3331189
         # but recover parts that are also instances of work
         FILTER NOT EXISTS {
-          VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q2831984) (wd:Q1760610) (wd:Q8274) } .
           ?part wdt:P31 ?work_type .
+          VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
         }
       }
 
diff --git a/server/data/wikidata/queries/works_reverse_claims.coffee b/server/data/wikidata/queries/works_reverse_claims.coffee
index 0a340396ee..98f4f56cf3 100644
--- a/server/data/wikidata/queries/works_reverse_claims.coffee
+++ b/server/data/wikidata/queries/works_reverse_claims.coffee
@@ -5,26 +5,8 @@ module.exports =
     """
     SELECT DISTINCT ?item WHERE {
       ?item wdt:#{pid} wd:#{qid} .
-      # book
-      { ?item wdt:P31 wd:Q571 . }
-      # literary work
-      UNION { ?item wdt:P31 wd:Q7725634 . }
-      # comic book album
-      UNION { ?item wdt:P31 wd:Q2831984 . }
-      # comic book
-      UNION { ?item wdt:P31 wd:Q1004 . }
-      # manga
-      UNION { ?item wdt:P31 wd:Q8274 . }
-      # book series
-      UNION { ?item wdt:P31 wd:Q277759 . }
-      # comic book series
-      UNION { ?item wdt:P31 wd:Q14406742 . }
-      # manga series
-      UNION { ?item wdt:P31 wd:Q21198342 . }
-      # novel series
-      UNION { ?item wdt:P31 wd:Q1667921 . }
-      # Filter-out entities tagged as both work and edition
-      FILTER NOT EXISTS { ?item wdt:P31 wd:Q3331189 }
+      ?item wdt:P31 ?work_type .
+      VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
     }
     LIMIT 1000
     """