API search fixes