add filter, change classname, cleanup