Seems to scale now. Only tested on one locality

Good first step, though.