fixed some bugs
Merge remote-tracking branch 'Places/master' into CustomBranch
extended db management