Finished query scrubbing, added in and out commands