Simple refactor and fixes in find client