Fix crossfilter after latest PRs

Fixes #1306    

Depends (partially) on #1307