Spex Updates as per Awight

Mostly I changed the information gathering block so that it
incorporates information from the dedupted contacts. Unfortunately
that means the query now takes twice as long.

Change-Id: Ia6df18ded77ce59a1102ef7bbaedb8017c6f8369