bug fix & json for location