Fixed nExtraTracks indexing for the extra tracks branches