Simplify last changes rendering

- no more extra if
- move select_related to template