removed TODO from enunciate template
refactored the tag mapping and removed todo