Improve tag output