adding fix for sql exception
Merge branch 'fix_empty_report_tab'