LPS-40748 Move the logic to the taglib
LPS-40748 Use the taglib to generate the link too