API Search fixes