diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java
index d7c9435ba..eb53c5cb3 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java
@@ -49,7 +49,7 @@ public class TagController extends BaseController {
         if (this.getApiContext().getOperationsContext().getElasticRepository().getDatasetRepository().exists()) {
             DatasetCriteria criteria = new DatasetCriteria();
             criteria.setHasTags(true);
-            List<Tag> tags = this.getApiContext().getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).filter(tag -> tag.getName().startsWith(query)).collect(Collectors.toList());
+            List<Tag> tags = this.getApiContext().getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).filter(tag -> tag.getName().toLowerCase().startsWith(query.toLowerCase())).collect(Collectors.toList());
 
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<Tag>>().payload(tags).status(ApiMessageCode.NO_MESSAGE));
         } else {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java
index da06aedd3..39da2a9bf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java
@@ -42,7 +42,7 @@ public class LicenseManager {
 
         ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         licenseModels.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, LicenseModel.class)).collect(Collectors.toList()));
-        licenseModels = licenseModels.stream().filter(licenseModel -> licenseModel.getName().contains(query)).collect(Collectors.toList());
+        licenseModels = licenseModels.stream().filter(licenseModel -> licenseModel.getName().toLowerCase().contains(query.toLowerCase())).collect(Collectors.toList());
         return licenseModels;
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LocalFetchManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LocalFetchManager.java
index fa135debe..b60a73108 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LocalFetchManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LocalFetchManager.java
@@ -22,7 +22,7 @@ public class LocalFetchManager {
 	public List<LocalFetchModel> getCurrency(String query) throws Exception {
 		List<Map<String, String>> data = localFetcher.retrieveCurrency();
 		List<LocalFetchModel> result = data.stream().map(entry -> new LocalFetchModel(entry.get("name"), entry.get("value"))).collect(Collectors.toList());
-		result = result.stream().filter(localFetchModel -> localFetchModel.getValue() != null).filter(StreamDistinctBy.distinctByKey(LocalFetchModel::getValue)).filter(localFetchModel -> localFetchModel.getName().contains(query)).collect(Collectors.toList());
+		result = result.stream().filter(localFetchModel -> localFetchModel.getValue() != null).filter(StreamDistinctBy.distinctByKey(LocalFetchModel::getValue)).filter(localFetchModel -> localFetchModel.getName().toLowerCase().contains(query.toLowerCase())).collect(Collectors.toList());
 		return result;
 	}
 }