LPS-34104 & LPS-34106 Improve app-view-entry taglib