Fixed async querying