Better handling of members picks page