Made faceting UI work; other minor enhancements.