Updated address loader to use correct mapping and minor updates for address finder providers/services