fix map and use standard popup