[FEATURE] Respect sorting in map if storagePid is empty