added faceted search and some minor enhancements