Still not working, but have to commit
Included Shiv's Changes to Tag Bar