Redo maps to don't depend on special Shelf level