re-enabled map popups and fixed some NPE