Fixing remaining bugs created when migrating from array to object representatin for asset list