Add searching into the API