changed order of location in JSON responses