[stable8.0] Improve filtering contacts, especially for phone numbers

[stable8.0] Improve filtering contacts, especially for phone numbers #4327