Improve/tweak the new filter methods, update doc blocks