refactor the filter/editor relationship

Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
16 files changed