Added aborting queries