Update to loading of layers