Chore/existing dbs words refinement 2

Supercedes #495 because GitHub is being weird with commit differences across branches.