Assets listing improvements and fixes