Make all multiple types of query fields

Make all multiple types of query fields correspond to a new column instead of row in query results

IE: Phone types- instead of a new row for each type per constituent, they should should as a new column in the same row.

Query