FC-1333 Clone query to start from correct query every time (this code is included in latest version of the module).