REPORT-555 - improved HQL