Updated thr facet functionality and general performance enhancements