Fix the way the asset list is assembled

We weren't doing the OR-ing correctly before.