better legacy vs. active database handling
tweak
Merge pull request #163 from Pomax/bug887453

better legacy vs. active database handling