PMO-2628: improved result structure loading