Fix filters for 'with address' and 'with email address'