Revert "Something was broken with last commit"

This reverts commit 23063fa32e2e855266d6ed3243e2dbd5810a5182.
Revert "Revert "Bugfix & DBStats updage""

This reverts commit e387ce5e83dc87e0d0ec512b76c656dd3f696a1d.
Fixed/Merged broken commit "Bugfix & DBStats"