Merge in incremental filter code from http://bit.ly/YTWCqH