Query Builder - Fix Date sort fields and format returned query to be on new lines and tabbed