Updated GridManager to handle resultsets