Fixed the first and last queries
Merge branch 'master' of github.com:magnet-cl/django-project-template