Improving map experience, #199