Various bug fixes in the demo app
Collection level object count, storage+nostorage