Tweak filters.

Make filters consistant with columns.

Change-Id: I13683eab46d568ebde7bd0eed56975427b2a4522