Makes filtering better

Change-Id: I8299340dba3b38c3db5df5e19f243cea1ba31073