diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java
index 8bdfacaab..e661e7ff2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java
@@ -45,8 +45,12 @@ public class FunderManager {
 			eu.eudat.models.data.funder.Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class)
 					.reference(externalListingItem.getRemoteId()).label(externalListingItem.getName())
 					.status(eu.eudat.data.entities.Funder.Status.fromInteger(0))
-					.source(externalListingItem.getTag())
 					.build();
+			if (externalListingItem.getSource() != null) {
+				funder.setSource(externalListingItem.getSource());
+			} else {
+				funder.setSource(externalListingItem.getTag());
+			}
 
 			funders.add(funder);
 		}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
index 61922b878..ba1f79cbe 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java
@@ -141,7 +141,7 @@ public class RemoteFetcher {
 
     private void ifFunderQueryExist(UrlConfiguration urlConfiguration, ExternalUrlCriteria externalUrlCriteria) {
         if (urlConfiguration.getFunderQuery() != null) {
-            if (externalUrlCriteria.getFunderId() != null) {
+            if (externalUrlCriteria.getFunderId() != null && urlConfiguration.getFunderQuery().startsWith("dmp:")) {
                 urlConfiguration.setUrl(urlConfiguration.getUrl().replace("{funderQuery}", urlConfiguration.getFunderQuery()));
             }
             else {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java
index 794d5c2dd..5526a5552 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java
@@ -13,6 +13,7 @@ public class FundersExternalSourcesModel extends ExternalListingItem<FundersExte
 			model.setUri(item.get("uri"));
 			model.setName(item.get("name"));
 			model.setDescription(item.get("description"));
+			model.setSource(item.get("source"));
 			model.setTag(item.get("tag"));
 			this.add(model);
 		}