Update #15 Filter logic changed