#608 - facet fixes