try to match the old redirects better