Added device search to api
merge