small fixes. add batchfilter