diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 48caf9db30..010d01ff02 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
-    <persistence-unit name="hmisPU" transaction-type="JTA">
-        <jta-data-source>jdbc/sethma</jta-data-source>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
-            <property name="eclipselink.logging.parameters" value="false"/>
-            <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
-        </properties>
-    </persistence-unit>
-    <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/sethmaaudit</jta-data-source>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
-            <property name="eclipselink.logging.parameters" value="false"/>
-            <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
-        </properties>
-    </persistence-unit>
+  <persistence-unit name="hmisPU" transaction-type="JTA">
+    <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+    <jta-data-source>jdbc/arogya</jta-data-source>
+    <exclude-unlisted-classes>false</exclude-unlisted-classes>
+    <properties>
+      <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+      <property name="eclipselink.logging.parameters" value="false"/>
+      <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
+    </properties>
+  </persistence-unit>
+  <persistence-unit name="hmisAuditPU" transaction-type="JTA">
+    <jta-data-source>jdbc/arogyaAudit</jta-data-source>
+    <class>com.divudi.entity.AuditEvent</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>
+      <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+      <property name="eclipselink.logging.parameters" value="false"/>
+      <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
+    </properties>
+  </persistence-unit>
 </persistence>
 
diff --git a/src/main/webapp/opd/batch_bill_cancel.xhtml b/src/main/webapp/opd/batch_bill_cancel.xhtml
index 0244862128..579a7a1801 100644
--- a/src/main/webapp/opd/batch_bill_cancel.xhtml
+++ b/src/main/webapp/opd/batch_bill_cancel.xhtml
@@ -18,8 +18,23 @@
                             <f:facet name="header">
                                 <h:outputText value="Batch Bill Cancellation" class="mt-5"/>
                                 <h:panelGrid columns="3" style="float: right" class="w-50">
-                                    <p:inputText placeholder="Enter Comments to Cancel Bill" value="#{billController.comment}" style="float: right" class="p-2 w-100"/>
-
+<!--                                    <p:inputText placeholder="Enter Comments to Cancel Bill" value="#{billController.comment}" style="float: right" class="p-2 w-100"/>-->
+                                    <p:selectOneMenu
+                                        id="commentsMenu"
+                                        value="#{billController.comment}"
+                                        editable="true"
+                                        filter="true"
+                                        placeholder="Select or enter a comment"
+                                        filterMatchMode="contains"
+                                        style="float: right; width: 100%"
+                                        class="p-2">
+                                        <f:selectItem itemLabel="Select or enter a comment" itemValue="" noSelectionOption="true"/>
+                                        <f:selectItems
+                                            value="#{configOptionApplicationController.getListOfCustomOptions('OPD Bill Cancellation Comments')}"
+                                            var="option"
+                                            itemLabel="#{option}"
+                                            itemValue="#{option}"/>
+                                    </p:selectOneMenu>
                                     <p:commandButton 
                                         ajax="false"
                                         value="Cancel Bill"