Enforce main key when choosing a contact, do more strict address pick-contact and do 'any' search on the contacts page.