Updated to get location table