Filter by contact type specific fields, error when required

I have run into a issue when filtering by a contact type.

I added a field type of Postal Address as created by module Address Field (addressfield) to a contact type I created. This set of fields have a few required (Address 1, City, Zip, etc). Now when I filter by that Contact Type, I get the following errors:

Address 1 field is required.
City field is required.
State field is required.
ZIP code field is required.

Because these are required fields in that form, and I hit apply, drupal complains that I left them blank.

Is there any way to have an option where I can pick which custom fields are included in the "Filter by contact type specific fields"? Then I could choose to not show the address field on the filter form.

Thanks,