LPS-32431 Use the taglib to simplify logic and make it easier to maintain
LPS-32431 Format source
LPS-32431 SF