Added KHN searching
Fixed conflict in views.py