added scope limiters in table model and a little refactoring+