Merge pull request #1069 from muzarski/replace-query-unpaged-in-examples

Merge pull request #1069 from muzarski/replace-query-unpaged-in-examples #2623