updated db iterators (avoid public domain code used to quickly test)