If I look at the full method, there is a lot of empty lines (which were introduced in the earlier PR that had some changes to support filters).  If this is the 'final' support, can we clean it up a bit?