diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java
index 18c498c4..c2aeef35 100644
--- a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java
@@ -78,7 +78,7 @@ public class BeneficiariesDTO {
 	private String otherFields;
 	private String genderName;
 	private String maritalStatusName;
-
+	private String community;
 	// End Outreach
 
 	// Start 1097
diff --git a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java
index e0ddde39..44cd0a88 100644
--- a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java
@@ -168,4 +168,5 @@ public class IdentityEditDTO {
 	private boolean emergencyRegistration;
 	private String otherFields;
 //	private Object otherFields;
+	private String communityName;
 }
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
index 800db14e..45064f55 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
@@ -280,7 +280,8 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
 	private String monthlyFamilyIncome;
 	@Expose
 	private boolean emergencyRegistration;
-	
+	@Expose
+	private String communityName;
 	@Expose
 	private Boolean passToNurse = false;
 	private String otherFields;
diff --git a/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java b/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java
index 038e34ef..e58f220b 100644
--- a/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java
+++ b/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java
@@ -16,8 +16,7 @@ public interface SectionAndFieldsMappingRepo extends CrudRepository<SectionAndFi
 //	List<SectionAndFieldsMapping> findBySectionIdAndSectionNameAndServiceProviderId(
 //			@Param("sectionId") Integer sectionId, @Param("serviceProviderId") Integer serviceProviderId);
 
-
-	@Query("SELECT sfm FROM SectionAndFieldsMapping sfm WHERE sfm.fieldName = :fieldName AND (sfm.serviceProviderId = :serviceProviderId OR sfm.serviceProviderId = 0) AND (sfm.projectId = :projectId OR sfm.projectId = 0)")
+	@Query("SELECT sfm FROM SectionAndFieldsMapping sfm WHERE sfm.sectionId = :sectionId AND (sfm.serviceProviderId = :serviceProviderId OR sfm.serviceProviderId= 0) AND (sfm.projectId = :projectId OR sfm.projectId= 0)")
 	List<SectionAndFieldsMapping> findSectionIdAndSectionNameAndServiceProviderId(
 			@Param("sectionId") Integer sectionId, @Param("serviceProviderId") Integer serviceProviderId, @Param("projectId") Integer projectId);
 	
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
index ba0b1872..8432d7e7 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
@@ -372,6 +372,8 @@ public List<BeneficiaryModel> getBeneficiaryListFromMapper(List<BeneficiariesDTO
 		benDetailForOutboundDTOList.forEach(beneficiaryModel -> {
 
 			BeneficiaryModel beneficiary = benCompleteMapper.benDetailForOutboundDTOToIBeneficiary(beneficiaryModel);
+			if(null != beneficiaryModel.getBeneficiaryDetails() && null != beneficiaryModel.getBeneficiaryDetails().getCommunity())
+				beneficiary.setCommunityName(beneficiaryModel.getBeneficiaryDetails().getCommunity());
 			if (beneficiary.getAge() == null) {
 				beneficiary.setAge(beneficiary.getActualAge());
 			}
diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
index 06f67a61..e591d1f6 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
@@ -114,6 +114,8 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut
 		Integer updatedRows = 0;
 
 		IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails);
+		if(null != benificiaryDetails.getI_bendemographics())
+			identityEditDTO.setCommunity(benificiaryDetails.getI_bendemographics().getCommunityName());
 		if (benificiaryDetails.getBeneficiaryIdentities() != null
 				&& benificiaryDetails.getBeneficiaryIdentities().size() > 0) {
 			identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(),