diff --git a/kgforge/specializations/resolvers/agent_resolver.py b/kgforge/specializations/resolvers/agent_resolver.py
index 54336ec2..097184a5 100644
--- a/kgforge/specializations/resolvers/agent_resolver.py
+++ b/kgforge/specializations/resolvers/agent_resolver.py
@@ -77,7 +77,8 @@ def _resolve(self, text: Union[str, List[str]], target: Optional[str], type: Opt
               }}
             }}
             """
-        context = self.service.get_context(resolving_context, target)
+        filters = self.service.filters[target] if target in self.service.filters else None
+        context = self.service.get_context(resolving_context, target, filters)
         query, strategy_dependant_limit = _build_resolving_query(text, query_template, self.service.deprecated_property, self.service.filters[target], strategy, type, properties_to_filter_with, context, SPARQLQueryBuilder, limit)
         expected_fields = properties_to_filter_with+["type"]
         return self.service.perform_query(query, target, expected_fields, strategy_dependant_limit)
diff --git a/kgforge/specializations/resolvers/store_service.py b/kgforge/specializations/resolvers/store_service.py
index 0ca8a2a9..6499499e 100644
--- a/kgforge/specializations/resolvers/store_service.py
+++ b/kgforge/specializations/resolvers/store_service.py
@@ -24,11 +24,10 @@ def __init__(self, store: Callable, targets: Dict[str, Dict[str, Dict[str, str]]
         self.filters: Dict[str, str] = dict()
         for identifier in targets:
             bucket = targets[identifier]["bucket"]
-            filters = targets[identifier]["filters"]
+            if 'filters' in targets[identifier]:
+                self.filters[identifier] = targets[identifier]["filters"]
             store_config.update(bucket=bucket)
             self.sources[identifier] = store(**store_config)
-            if filters:
-                self.filters[identifier] = filters
         self.deprecated_property = "https://bluebrain.github.io/nexus/vocabulary/deprecated"
 
     def perform_query(self, query: str, target: str, expected_fields: List[str],