Fixed parser for server_name