[#63313086] Make minor crossfiltering improvements