Fix BHDatabaseManager BUGs