Improvements to loading cities and catalog for citiy