Fix map popups after 0.8.2 update