Fixes facet view issue and potential lock in pattern query