Addition of .queryUntil functions & extraction of .waitUntil's