Minor bug fix and StrapQuery patch

Fixed a minor bug where specifying ?template=something would return a
random template and patched the StrapQuery template with column
information.