Better handling of dots symbol (Unicode and ASCII)