Fixed Facet focus
Merge branch 'facet-reload-fix' into build-29