Additional email not searched in global search

We have contact records who exists at a head office for example, and buy on behalf of numerous divisions around the UK. If this contact gave us an enquiry for a particular division, we want the enquiry to go against that division and not head office. Therefore we need to have the same contact existing at multiple divisions. The problem we are findng is that, unlike crm version 6, you can only have one primary email address and any other contact records with that same email address need to utilise the 'additional email' field. This causes two issues:

1) The global search will only find primary email addresses when searching the email address.

2) Documents pinned to the menu will not appear in the quote screen if the contact does not have a primary email address.

This improvement is to enable the global search and documents to work with 'additional emails'.