Fixes #175, also changed logic for group listings.