FilterForm and other fixes for new stream interface