#2455 - Cleanup and making the filter actually work.