refactored host find end point