REPORT-555 - improved HQL
Merge pull request #51 from jlkeiper/REPORT-555

REPORT-555 - improved HQL