Also add subtag
Subtag order tests and fixes