add group-by-null-first filter