Added support for marking up [user] in story