Fixed new user code, started implementing query scrubbing