Added client searching :octocat: