Document Tag: Better performance and user experience