diff --git a/config-data-executor/src/main/java/org/micord/service/DownloadService.java b/config-data-executor/src/main/java/org/micord/service/DownloadService.java
index d881930..639ef50 100644
--- a/config-data-executor/src/main/java/org/micord/service/DownloadService.java
+++ b/config-data-executor/src/main/java/org/micord/service/DownloadService.java
@@ -468,12 +468,13 @@ public class DownloadService {
 		Boolean emptyDatesAllowed = validationResults.get(ValidationService.IS_EMPTY_DATES_ALLOWED);
 
 		Map<String, Object> resultMap = new HashMap<>();
-		String endpointArguments;
+		String endpointArguments = "";
 
 		String requestURL = request.getRequestURL();
 
 		if (!emptyDatesAllowed) {
-			requestURL = prepareRequestURL(request, startDate, endDate);
+			requestURL = prepareRequestURL(request.getRequestURL(), startDate, endDate);
+			requestURL = requestURL.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase());
 		}
 
 		if (emptyIdsAllowed != null && emptyIdsAllowed) {
@@ -501,6 +502,8 @@ public class DownloadService {
 					try (Connection connection = DatabaseConnection.getConnection(
 							argument.getRequestArgumentConnectionParams())) {
 						String query = argument.getRequestArgumentURL();
+						query = prepareRequestURL(query, startDate, endDate);
+						query = query.replace("${endpointArguments}", endpointArguments);
 						int subOffset = 0;
 						List<String> aggregatedIds = new ArrayList<>();
 						while (true) {
@@ -549,17 +552,15 @@ public class DownloadService {
 		return resultMap;
 	}
 
-	private String prepareRequestURL(SQLDownloadRequest request, LocalDate startDate,
+	private String prepareRequestURL(String requestURL, LocalDate startDate,
 									 LocalDate endDate) {
-		String requestURL = request.getRequestURL();
-
 		if (startDate != null) {
 			requestURL = requestURL.replace("${startDate}", startDate.toString());
 		}
 		if (endDate != null) {
 			requestURL = requestURL.replace("${endDate}", endDate.toString());
 		}
-		return requestURL.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase());
+		return requestURL;
 	}
 
 	private List<String[]> executeSqlQuery(Connection connection, String query) throws SQLException {