[#825] Added map to Org list