better passing of mapid and dirty state for initial upload