Reworked query build for main report view to fetch from xml
Merged remote changes into home repo