Shortened headers and reorded with reference and query results together