Updated svg parsing for APG, added missing index