Support tags fro non-combined assets
Fixed tag combination issues