diff --git a/src/main/java/org/epos/handler/dbapi/dbapiimplementation/EquipmentDBAPI.java b/src/main/java/org/epos/handler/dbapi/dbapiimplementation/EquipmentDBAPI.java
index 402dae0..e162655 100644
--- a/src/main/java/org/epos/handler/dbapi/dbapiimplementation/EquipmentDBAPI.java
+++ b/src/main/java/org/epos/handler/dbapi/dbapiimplementation/EquipmentDBAPI.java
@@ -212,6 +212,7 @@ && isAlreadyPublished(EDMEquipment.class, "equipment.findByUidAndState", em, epo
 		edmObject.setDescription(eposDataModelObject.getDescription());
 		edmObject.setDynamicrange(eposDataModelObject.getDynamicRange());
 		edmObject.setFilter(eposDataModelObject.getFilter());
+		edmObject.setKeywords(eposDataModelObject.getKeywords());
 
 		if (eposDataModelObject.getIsPartOf() != null) {
 			if(edmObject.getEquipmentFacilitiesByInstanceId()!=null)
@@ -438,6 +439,7 @@ protected Equipment mapFromDB(Object edmObject) {
 		o.setOrientation(edm.getOrientation());
 		o.setSamplePeriod(edm.getSampleperiod());
 		o.setSerialNumber(edm.getSerialnumber());
+		o.addKeywords(edm.getKeywords());
 		o.setSpatialExtent(
 				edm.getEquipmentSpatialsByInstanceId() != null ?
 						new ArrayList<>(edm.getEquipmentSpatialsByInstanceId().stream()
diff --git a/src/main/java/org/epos/handler/dbapi/dbapiimplementation/FacilityDBAPI.java b/src/main/java/org/epos/handler/dbapi/dbapiimplementation/FacilityDBAPI.java
index a09154b..8cd9455 100644
--- a/src/main/java/org/epos/handler/dbapi/dbapiimplementation/FacilityDBAPI.java
+++ b/src/main/java/org/epos/handler/dbapi/dbapiimplementation/FacilityDBAPI.java
@@ -221,6 +221,7 @@ && isAlreadyPublished(EDMFacility.class, "facility.findByUidAndState", em, eposD
 		}
 
 		edmObject.setDescription(eposDataModelObject.getDescription());
+		edmObject.setKeywords(eposDataModelObject.getKeywords());
 
 		if (eposDataModelObject.getIsPartOf() != null) {
 			if(edmObject.getFacilityFacilitiesByInstanceId()!=null)
@@ -434,7 +435,7 @@ protected Facility mapFromDB(Object edmObject) {
 					.entityType("ContactPoint")));
 		}
 		o.setDescription(edm.getDescription());
-
+		o.addKeywords(edm.getKeywords());
 		if (edm.getFacilityFacilitiesByInstanceId() != null) {
 			o.setIsPartOf(new LinkedList<>());
 			edm.getFacilityFacilitiesByInstanceId().stream()