I recommend using https://github.com/newren/git-filter-repo instead of filter-branch.