Once "multiple bulk" setting, cannot search for opt out or on hold contacts

First ensure that the setting "Enable multiple bulk email address for a contact." is on at civicrm/admin/setting/preferences/mailing?reset=1

This settings places a single email on "opt out", no longer the entire contact is on "opt out". (see opt-out2.png).

However, this presents problems with searching, this contact, once an email is 'on hold opt out':

1. no longer shows up when searching for 'on hold'

2. no longer when searching for 'opt out'

I think the problem is that civicrm_email.on_hold has possible 3 values when this setting is applied: 0, 1, 2. The searches, however, are boolean and do not return emails where on_hold=2.

(attached illustrations)