more fixes for location to location_id change