#42, #43: Fixed issues with host param parsing