bugfix, improved poll scheduling to reduce poll rate for slower queries