XML value extraction fix