A couple more tag related bug fixes and missing features