Update from gxp and worldmap