BUG FIX: filter not working properly