Cleanup and fix column filter on columnDef change