Alter schema to improve query speed for contact details

This is now working correctly, and gives a worthwhile speed improvement.