LIVEOAK-700: Count storage using datastore properly in app list
LIVEOAK-699: Use the display friendly name instead of id for the datastores