Minor cleanups and renaming in filter tracks