Map now survives facet changes