changing tag format from <@TAG/> to <@TAG@>