Fix byFilter regression