Improvements to get to make templates more reusable (version 2)

Related with https://github.com/unaizalakain/django/pull/1