Add faceted search and simplify!