made behavior for Util.range_with_surrounding_space uniform for both sides and fixed cli_spec