better solution for @username hyperlinks added