Fix crossfilter