Fix database, faster and more precise but broken (no get by id)
Fix database id stuff