Added group specific listing
Added quotes