Check correct variable when loading network mappings
Ensure network mapping is loaded early
Ensure we sort using correct callback