improved the way the results are being parsed