LPS-34706 move logic to the right jsp