Add a special case for client searches

Fixes #13.