Better focus fetching that only reparses if we haven't parsed it yet
Fix updated plan so it's consistent