better handling of successive queries