#6359: Use the raw query data from EFQ to make the list.