Handle fetch by lot also for bounded fetch

+ refactoring