Fix join ID / index info