Simplify search api.
Remove unused warning suppression.