DRMP: Fix map popups