Fixed query queue lockup and started adding divide aggregator