[*] few bugfixes
[*] fixes due to new database design