[*] fixes due to new database design