[Bug #1768] Maps Popup integration is broken