Improve host setting for API