Migrated dbs queries to dbs3