Add correct formatting of tags