improved updateDB, fixed issue with index/key with index name
Merge branch 'issue-updateDB-r2' into develop

t# the commit.