Refactoring, field attributes filtering, query-locator support