REPORTS-196: Modified jsp and controller