Batch set restrictions on fetch, refactoring