Adding auto-links tagging