Yes I need to go and tidy those up. I'll use your suggested tagging scheme.

Mostly fixed now, I think :-)