fixing some templates and querysets