Improve use of tags and validation