SOS-2175 Clean up jsps and liferay-portlet.xml
LPS-45412 Fix for search