further cleanup tag module template markup