Improve filtering in ArrayDataSource