Filtering now working correctly

Change-Id: Ie7cea8eb2a65160aea9393dfb3d2575eba830c8a