Update Filtering

Another step to merge to master.