Add more search facets, minor UI tweaks