Rewrite client to be more usable for search and params