Groups mode and entity mode now work when showing the offline indicator. Fixed some trailing comma issues as well.
#MBL-10664