performance tweak and bugfix
merged dbbrowser from master; now they should be even and merging one to another should not mess up newer bug fixes