Improving map experience for current conditions, #199