Fixes facet view issue and potential lock in pattern query
Merge pull request #1309 from emmanuel-keller/1.5

Fixes facet view issue and potential lock in pattern query