WP-2445: clubs listing changes.