Replacing location with service JSON. #fix