Fixing group 2 list pages.
Merge remote-tracking branch 'origin/master'