Added more facet to search controller
Minor changes