LPS-51789 Simplify jsp logic