-continued switch to AsyncQueryHandler as well as some general cursor
maintenance