diff --git a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java
index 678b270a0..5fe3cf81f 100644
--- a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java
+++ b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/community/QueryInformationSystem.java
@@ -1,8 +1,10 @@
 
 package eu.dnetlib.dhp.bulktag.community;
 
+import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.dom4j.DocumentException;
 import org.xml.sax.SAXException;
 
@@ -13,74 +15,17 @@ import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
 
 public class QueryInformationSystem {
-	private static final String XQUERY = "for $x in collection('/db/DRIVER/ContextDSResources/ContextDSResourceType') "
-		+ "  let $subj := $x//CONFIGURATION/context/param[./@name='subject']/text() "
-		+ "  let $datasources := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::contentproviders')]/concept  "
-		+ "  let $organizations := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::resultorganizations')]/concept  "
-		+ "  let $communities := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::zenodocommunities')]/concept  "
-		+ "  let $fos := $x//CONFIGURATION/context/param[./@name='fos']/text() "
-		+ "  let $sdg := $x//CONFIGURATION/context/param[./@name='sdg']/text() "
-		+
-		"let $zenodo := $x//param[./@name='zenodoCommunity']/text() "
-		+ "  where $x//CONFIGURATION/context[./@type='community' or ./@type='ri'] and $x//context/param[./@name = 'status']/text() != 'hidden'  "
-		+ "  return  "
-		+ "  <community>  "
-		+ "  { $x//CONFIGURATION/context/@id}  "
-		+ " <advancedConstraints>" +
-		"{$x//CONFIGURATION/context/param[./@name='advancedConstraints']/text() }" +
-		"</advancedConstraints>"
-		+ "  <subjects>  "
-		+ "  {for $y in tokenize($subj,',')  "
-		+ "  return  "
-		+ "  <subject>{$y}</subject>}  "
-		+ "  {for $y in tokenize($fos,',')  "
-		+ "  return  "
-		+ "  <subject>{$y}</subject>}  "
-		+ "  {for $y in tokenize($sdg,',')  "
-		+ "  return  "
-		+ "  <subject>{$y}</subject>}  "
-		+ "  </subjects>  "
-		+ "  <datasources>  "
-		+ "  {for $d in $datasources  "
-		+ "  where $d/param[./@name='enabled']/text()='true'  "
-		+ "  return  "
-		+ "  <datasource>  "
-		+ "  <openaireId>  "
-		+ "  {$d//param[./@name='openaireId']/text()}  "
-		+ "  </openaireId>  "
-		+ "  <selcriteria>  "
-		+ "  {$d/param[./@name='selcriteria']/text()}  "
-		+ "  </selcriteria>  "
-		+ "  </datasource> } "
-		+ "  </datasources>  " +
-		"  <zenodocommunities>  " +
-		"{for $zc in $zenodo " +
-		"return " +
-		"<zenodocommunity> " +
-		"<zenodoid> " +
-		"{$zc} " +
-		"</zenodoid> " +
-		"</zenodocommunity>}"
-		+ "  {for $zc in $communities  "
-		+ "  return  "
-		+ "  <zenodocommunity>  "
-		+ "  <zenodoid>  "
-		+ "  {$zc/param[./@name='zenodoid']/text()} "
-		+ "  </zenodoid> "
-		+ "  <selcriteria> "
-		+ "  {$zc/param[./@name='selcriteria']/text()} "
-		+ "  </selcriteria> "
-		+ "  </zenodocommunity>} "
-		+ "  </zenodocommunities>  "
-		+ "<advancedConstraint>"
-		+ "{$x//CONFIGURATION/context/param[./@name='advancedConstraint']/text()} "
-		+ "</advancedConstraint>"
-		+ "  </community>";
 
 	public static CommunityConfiguration getCommunityConfiguration(final String isLookupUrl)
-		throws ISLookUpException, DocumentException, SAXException {
+		throws ISLookUpException, DocumentException, SAXException, IOException {
 		ISLookUpService isLookUp = ISLookupClientFactory.getLookUpService(isLookupUrl);
-		final List<String> res = isLookUp.quickSearchProfile(XQUERY);
+		final List<String> res = isLookUp
+			.quickSearchProfile(
+				IOUtils
+					.toString(
+						QueryInformationSystem.class
+							.getResourceAsStream(
+								"/eu/dnetlib/dhp/bulktag/query.xq")));
 
 		final String xmlConf = "<communities>" + Joiner.on(" ").join(res) + "</communities>";
 
diff --git a/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/bulktag/query.xq b/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/bulktag/query.xq
index e69de29bb..6fbd74c8f 100644
--- a/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/bulktag/query.xq
+++ b/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/bulktag/query.xq
@@ -0,0 +1,58 @@
+for $x in collection('/db/DRIVER/ContextDSResources/ContextDSResourceType')
+let $subj := $x//CONFIGURATION/context/param[./@name='subject']/text()
+let $datasources := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::contentproviders')]/concept
+let $organizations := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::resultorganizations')]/concept
+let $communities := $x//CONFIGURATION/context/category[./@id=concat($x//CONFIGURATION/context/@id,'::zenodocommunities')]/concept
+let $fos := $x//CONFIGURATION/context/param[./@name='fos']/text()
+let $sdg := $x//CONFIGURATION/context/param[./@name='sdg']/text()
+let $zenodo := $x//param[./@name='zenodoCommunity']/text()
+where $x//CONFIGURATION/context[./@type='community' or ./@type='ri'] and $x//context/param[./@name = 'status']/text() != 'hidden'
+return
+<community>
+{ $x//CONFIGURATION/context/@id}
+<advancedConstraints>
+{$x//CONFIGURATION/context/param[./@name='advancedConstraints']/text() }
+</advancedConstraints>
+ <subjects>
+ {for $y in tokenize($subj,',')
+ return
+ <subject>{$y}</subject>}
+ {for $y in tokenize($fos,',')
+ return
+ <subject>{$y}</subject>}
+ {for $y in tokenize($sdg,',')
+ return
+ <subject>{$y}</subject>}
+ </subjects>
+ <datasources>
+ {for $d in $datasources
+ where $d/param[./@name='enabled']/text()='true'
+ return
+ <datasource>
+ <openaireId>
+ {$d//param[./@name='openaireId']/text()}
+ </openaireId>
+ <selcriteria>
+ {$d/param[./@name='selcriteria']/text()}
+ </selcriteria>
+ </datasource> }
+ </datasources>
+  <zenodocommunities>
+{for $zc in $zenodo
+return
+<zenodocommunity>
+<zenodoid>
+{$zc}
+</zenodoid>
+</zenodocommunity>}
+{for $zc in $communities
+return
+<zenodocommunity>
+<zenodoid>
+{$zc/param[./@name='zenodoid']/text()}
+</zenodoid>
+<selcriteria>
+{$zc/param[./@name='selcriteria']/text()}
+</selcriteria>
+</zenodocommunity>}
+</zenodocommunities>
\ No newline at end of file