Improve tag/include abbr