Make user search in Teams consistent

In Teams, we are seeing different results depending on the method we use to search for a user in Teams.

1.In Chat, if you type a user name out in the Search area and go to people, what comes back is the name ALONG with their UPN ID (Like XZXXX1@nam.corp.conteso.com)
2. In Chat, if you go to just start a chat with someone, and type in their name you will see the name along with their USER ID only (like XZXXX1)
3. In a channel, if you go to mention a person using the @ symbol, as you type in the name you see their name along with their email ID (like joe.smith@conteso.com)
4. In a Team, if you go to add a member, and you start to type the name in you see their name and their USER ID (like XZXXX1)

In each Use Case, it seems to look at different attributes in AAD. What we would like is that is shows a users email address since that is the most easiest method for a person to be recognised.