Fix XML lookup, g_id is now unique