Now handles some errors better.
Also, enables to query for partial results IEEE