Fixes for contacts with no primary email address

Fixes: 
1) Check contacts for which the matching email is not primary
2) Change the names in stats