CMOSD-237: persisted simple query between pagination calls