Adding session swapping to allow continued async querying