Fix rowCollectionOnDone and rowCollectionOnRequestCompletion