Order by column searched

Also rearranged a few things on the output