Ticket #1509: Adding for reports page as well