Biggish refactor to make querying consistent.

Also, little fix to the template for when multiple descriptions
are being combined.