Production push: urgent map and analytic fixes