CLSN-1982 icici : queries move to reporting