Client discovery should default to the search query

[dissonanz]

Let's DRY out the search for clients. Rather than specify the same search query for clients and search, let the clients search default to the one specified by the search attribute.

[tas50]

@dissonanz If you want to rebase this I'll gladly merge it in.