Fixed search in API server