Added weekly balance to query hours
Merge branch 'gh7'