Corrected layer ordering when saving map