Fixed issue with search on product page
Minor clean up