LPS-52004 Move logic outside the module and into the taglib