Multiple stuffs

- Add template hack so I can work on stuff in a template
- Separate out query argument creation into a separate function, which will be
  filtered by each content type. Implement in groups