Fixed the endpoints header correctly. The contacts sometimes has alias like