diff --git a/api/license-header.txt b/api/license-header.txt
new file mode 100644
index 00000000..1b0eb4fe
--- /dev/null
+++ b/api/license-header.txt
@@ -0,0 +1,7 @@
+This Source Code Form is subject to the terms of the Mozilla Public License, 
+v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under 
+the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS 
+graphic logo is a trademark of OpenMRS Inc.
\ No newline at end of file
diff --git a/omod/license-header.txt b/omod/license-header.txt
new file mode 100644
index 00000000..1b0eb4fe
--- /dev/null
+++ b/omod/license-header.txt
@@ -0,0 +1,7 @@
+This Source Code Form is subject to the terms of the Mozilla Public License, 
+v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under 
+the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS 
+graphic logo is a trademark of OpenMRS Inc.
\ No newline at end of file
diff --git a/omod/src/main/webapp/admin/programs/conversionForm.jsp b/omod/src/main/webapp/admin/programs/conversionForm.jsp
index c35945e9..8f8b9f9f 100644
--- a/omod/src/main/webapp/admin/programs/conversionForm.jsp
+++ b/omod/src/main/webapp/admin/programs/conversionForm.jsp
@@ -17,6 +17,7 @@
 <openmrs:htmlInclude file="/dwr/util.js" />
 	
 <form method="post" id="theForm">
+	
 <table>
 	<tr>
 		<td><openmrs:message code="Program.conversion.programWorkflow"/>:<span class="required">*</span></td>
diff --git a/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js b/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js
index 56fb3b74..baee712f 100644
--- a/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js
+++ b/omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js
@@ -851,14 +851,15 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler,
                     attributeValue = rowData.attributes[a.name];
                     if(attributeValue == null)
                         attributeValue = '';
-
                     rRowData.push(attributeValue);
                 });
             }
-
+            for (k in rRowData)
+            {
+                rRowData[k] = $j("<div>").text(rRowData[k]).html();
+            }
             return rRowData;
         },
-
         _fireEvent: function(eventType, data) {
             //TODO also pass 'this'
         },