Fix facets with add / remove tags