Improve custom anchor tag