diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/variant/annotation/VariantAnnotationCalculator.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/variant/annotation/VariantAnnotationCalculator.java
index d54ceb662..a16239e87 100644
--- a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/variant/annotation/VariantAnnotationCalculator.java
+++ b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/variant/annotation/VariantAnnotationCalculator.java
@@ -431,6 +431,7 @@ private List<GeneMirnaTarget> getTargets(Gene mirna) throws QueryException, Ille
             }
         }
         GeneQuery geneQuery = new GeneQuery();
+        geneQuery.setDataRelease(dataRelease);
         geneQuery.setAnnotationTargets(new LogicalList<>(mirnas, false));
         List<GeneMirnaTarget> geneMirnaTargets = new ArrayList<>();
         List<Gene> genes = (geneManager.search(geneQuery)).getResults();
@@ -679,9 +680,9 @@ public List<Gene> getBatchGeneList(List<Variant> variantList)
 
         List<Gene> geneList = new ArrayList<>();
         GeneQuery geneQuery = new GeneQuery();
+        geneQuery.setDataRelease(dataRelease);
         geneQuery.setIncludes(includeGeneFields);
         geneQuery.setRegions(regionList);
-        geneQuery.setDataRelease(dataRelease);
 
         if (StringUtils.isNotEmpty(consequenceTypeSource)) {
             // sources can be "ensembl" and/or "refseq". query is validated before execution, will fail if invalid value
@@ -1354,6 +1355,7 @@ private boolean[] getRegulatoryRegionOverlaps(String chromosome, Integer start,
         boolean[] overlapsRegulatoryRegion = {false, false};
 
         RegulationQuery query = new RegulationQuery();
+        query.setDataRelease(dataRelease);
         query.setExcludes(Collections.singletonList("_id"));
         query.setIncludes(Collections.singletonList("chromosome"));
         query.setLimit(1);