Clean up handling of filter buttons in individual/family lists (contd)