diff --git a/beat/web/search/views.py b/beat/web/search/views.py
index 2e139be5bb17d24378570053954252a405c266ea..19a7f34a008c13bda621276b8c50cbb0b659ca69 100644
--- a/beat/web/search/views.py
+++ b/beat/web/search/views.py
@@ -26,9 +26,8 @@
 ###############################################################################
 
 from django.http import Http404
-from django.shortcuts import render_to_response, redirect
+from django.shortcuts import render, redirect
 from django.shortcuts import get_object_or_404
-from django.template import RequestContext
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.db.models import Count
@@ -285,16 +284,16 @@ def search(request):
     if 'settings' in request.POST: #overrules the other two
         display_settings = request.POST['settings'].strip()
 
-    return render_to_response('search/view.html',
-                              dict(
-                                  search=None,
-                                  owner=False,
-                                  filters=filters,
-                                  settings=display_settings,
-                                  results=search_experiments(request.user, json.loads(filters)),
-                                  URL_PREFIX=settings.URL_PREFIX,
-                              ),
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'search/view.html',
+                  dict(
+                      search=None,
+                      owner=False,
+                      filters=filters,
+                      settings=display_settings,
+                      results=search_experiments(request.user, json.loads(filters)),
+                      URL_PREFIX=settings.URL_PREFIX,
+                  ))
 
 
 #------------------------------------------------
@@ -327,19 +326,18 @@ def view(request, author_name, query_name):
     # Users the object can be shared with
     users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username')
 
-    return render_to_response('search/view.html',
-                              {
-                                  'search': obj,
-                                  'owner': (request.user == obj.author),
-                                  'filters': filters,
-                                  'settings': display_settings,
-                                  'results': search_experiments(request.user, json.loads(filters)),
-                                  'URL_PREFIX': settings.URL_PREFIX,
-                                  'users': users,
-                                  'teams': Team.objects.for_user(request.user, True)
-                              },
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'search/view.html',
+                  {
+                      'search': obj,
+                      'owner': (request.user == obj.author),
+                      'filters': filters,
+                      'settings': display_settings,
+                      'results': search_experiments(request.user, json.loads(filters)),
+                      'URL_PREFIX': settings.URL_PREFIX,
+                      'users': users,
+                      'teams': Team.objects.for_user(request.user, True)
+                  })
 
 
 #----------------------------------------------------------
@@ -357,14 +355,13 @@ def ls(request, author_name):
     objects = Search.objects.from_author_and_public(request.user,
                                                     author_name).order_by('-creation_date')
 
-    return render_to_response('search/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=author,
-                                  owner=(request.user==author),
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'search/list.html',
+                  dict(
+                      objects=objects,
+                      author=author,
+                      owner=(request.user==author),
+                  ))
 
 
 #----------------------------------------------------------
@@ -376,14 +373,13 @@ def public_ls(request):
     # orders searchs so that the latest information is displayed first
     objects = Search.objects.public().order_by('-creation_date')
 
-    return render_to_response('search/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=request.user,
-                                  owner=False,
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'search/list.html',
+                  dict(
+                      objects=objects,
+                      author=request.user,
+                      owner=False,
+                  ))
 
 
 #----------------------------------------------------------