HOTFIX: Add state facet