Updated UI and improved search type faceting