Added few assets and fixed listing loading/caching code