new map workflow fixes