resolved a couple of edgecases around big fetch & partly history