Added add and remove functions to FilterModel
fix merge conflicts