Fix old<->new facet mapping