Some changes to fix some facet bugs regarding showing and hiding instances