cleaned up DataFilter code and fixed backwards compatibility.
cleaned up DataFilter code and fixed backwards compatibility.


Change-Id: I2a5430331ff1cdcf9087469e0bd835daa07dce11

WeaveTeam/WeaveJS,WeaveTeam/WeaveJS,WeaveTeam/WeaveJS,WeaveTeam/WeaveJS