Move to Query model, output header