With filter fix

Grab support for filters from bsadeh's repo; avoid the rest of his changes -- we're stuck on 19.4 and ES introduced a breaking protocol change after that.