Added tags re-ordering support