Updated joins in views.py