Fix grid filtering to add and remove - #720