I just pushed up an update for this... it turns out we can't directly go through filter because that goes through all batches, whereas in the subtable case we have very specific batches.   Instead I refactored filter to use filter_batch under the covers and then let subtables use that directly.  And since filter_batch accepts a block, using the local data ends up being easy.