small refactoring + spetial host if not "@" + port comes to servers