Authtoken fix for rawquery