API: improve searching by keyword.