#289, #286 comm chart fixes
Merge pull request #290 from ua-snap/comm_charts_refix

#289, #286 comm chart fixes