Improve @Tag section in Annotations