Fixed averages query error
Merge branch 'friends' of ssh://github.com/mikedussan/Muneris into friends