Separate Filters into their own section

Change-Id: I4191f9228e3d098909fcf6efc3f450f4c9581ccb