--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java	Wed Sep 14 10:00:55 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java	Wed Sep 14 10:11:50 2011 +0000
@@ -19,6 +19,8 @@
 import com.smartgwt.client.widgets.layout.VLayout;
 import com.smartgwt.client.widgets.tab.TabSet;
 import com.smartgwt.client.widgets.tab.Tab;
+import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
+import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
 
 import de.intevation.flys.client.shared.model.ArtifactDescription;
 import de.intevation.flys.client.shared.model.Data;
@@ -53,6 +55,8 @@
 
     protected DoubleRangePanel distancePanel;
 
+    protected TableFilter filter;
+
     protected TabSet tabs;
 
     protected double min;
@@ -465,10 +469,16 @@
         tabs.addTab(locations, 0);
         tabs.addTab(distances, 1);
 
-        TableFilter filter = new TableFilter();
+        filter = new TableFilter();
         filter.setHeight("30px");
         filter.addFilterHandler(this);
 
+        tabs.addTabSelectedHandler(new TabSelectedHandler() {
+            public void onTabSelected(TabSelectedEvent evt) {
+                filter.clear();
+            }
+        });
+
         helperContainer.addMember(tabs);
         helperContainer.addMember(filter);
     }
@@ -483,7 +493,8 @@
             distancesTable.filterData(c);
         }
         else {
-            // TODO Remove filter
+            locationsTable.clearCriteria();
+            distancesTable.clearCriteria();
         }
     }