Improved auto-text annotations
