Fix targets being constantly reassigned
Use redirects & heuristic