diff --git a/webapp/views.py b/webapp/views.py
index 5b28ac1..2306413 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -44,8 +44,8 @@ class EventViewSet(ModelViewSet):
     serializer_class = EventSerializer
     permission_classes = [IsAuthenticatedOrReadOnly]
     filter_backends = (filters.DjangoFilterBackend, SearchFilter, OrderingFilter)
-    filter_fields = '__all__'
-    search_fields = '__all__'
+    filter_fields = ('id', 'tags', 'visible', 'signupForm')
+    search_fields = ('id', 'tags', 'visible', 'signupForm')
 
     def get_queryset(self):
 
@@ -225,8 +225,8 @@ class FeedViewSet(ModelViewSet):
     serializer_class = FeedSerializer
     permission_classes = [IsAuthenticatedOrReadOnly]
     filter_backends = (filters.DjangoFilterBackend, SearchFilter, OrderingFilter)
-    filter_fields = '__all__'
-    search_fields = '__all__'
+    filter_fields = ('id', 'tags', 'visible')
+    search_fields = ('id', 'tags', 'visible')
 
     def get_queryset(self):
         if self.request.user.is_authenticated: