Fix tag order

fixes #4151
- Properly re-add pre-existing tags to beginning of array
Merge pull request #4153 from halfdan/4151-tag-order

Fix tag order