improve GoOracle automatic scope handling