Update consideration for DB search API change