Make new-style facet deletion more robust