Make filtered target numbering contiguous after all