Improve tag and account rendering