Modified main contact query to look for empty display values in addition to NULL values.
Merge branch 'dev' into test