Improved accuracy using #tags and \@s