Fixed: some of filter, splitting work