Refactored field name to hub id to location id