File system locator now correctly loads country information and processes overrides