diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/FrontEndController.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/FrontEndController.java
index c0f675f..5dcf9d2 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/FrontEndController.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/FrontEndController.java
@@ -18,6 +18,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.texttechnologylab.project.gruppe_05_1.util.PPRUtils.listFractionsFromMembers;
+
 public class FrontEndController {
     @OpenApi(
             summary = "Get the homepage.",
@@ -50,12 +52,12 @@ public class FrontEndController {
         String filter = ctx.queryParam("filter");
         Logger.info("Filter: '" + filter + "'");
 
-        List<Parlamentarier> parlamentarier = MongoPprUtils.getAllParlamentarier(filter);
+        List<Parlamentarier> parlamentarier = MongoPprUtils.getFilteredMembers(ctx);
         PPRUtils.sortParlamentarierByName(parlamentarier);
-        Logger.info(parlamentarier.size() + " MdBs gefunden");
 
         Map<String, Object> attributes = new HashMap<>();
         attributes.put("parlamentarier", parlamentarier);
+        attributes.put("parties", listFractionsFromMembers(MongoPprUtils.getAllParlamentarier("")));
         attributes.put("filter", filter);
         ctx.render("parlamentarier.ftl", attributes);
     }
diff --git a/src/main/resources/templates/filterForm.ftl b/src/main/resources/templates/filterForm.ftl
index 0e0ba2e..22ef093 100644
--- a/src/main/resources/templates/filterForm.ftl
+++ b/src/main/resources/templates/filterForm.ftl
@@ -1,4 +1,15 @@
-        <form name="searchForm" action="/members" method="get">
-          Name : <input type="text" name="filter" value="${filter!' '}" />
-          <input id="search-button" type="submit" value="Suche" />
-        </form>
\ No newline at end of file
+<div class="filter-form">
+    <form method="GET" action="/members">
+        <input type="text" name="firstName" placeholder="First Name">
+        <input type="text" name="name" placeholder="Last Name">
+        <select id="party" name="party">
+            <option value="">All</option>
+            <#-- Iterate over the parties list and create an option for each one -->
+            <#list parties as party>
+                <option value="${party}">${party}</option>
+            </#list>
+        </select>
+        <button type="submit">Search</button>
+        <a href="/members/add" class="add-member-button">Add Member</a>
+    </form>
+</div>