Fixed Another Issue with Group Area of Expert Dashboard

In some cases, not all of the groups were showing up, the query had to
be tweaked to cover these cases.
Merge branch 'bug_fix_for_dashboard' into development
Merge branch 'development' into easy_bake
handle another condition, change label
cleaning up group page