Fix use of tags.