Fixing broken facets bug