Re-ordered steps in fetchmaps