data load fix & gmap in progress