Moved logic for creating Header view model to query handler