fetch improvement (limit option fix)