anchor.diff:              FromTag -> 
                   FromOpts = From#uri.ext_opts
           end,
  -        case nksip_lib:get_binary(user_agent, Opts) of
  +        case nksip_lib:get_binary(user_agent, FullOpts) of
               <<>> -> UserAgent = <<"NkSIP ", ?VERSION>>;
               UserAgent -> ok
           end,
           Headers = 
  -                proplists:get_all_values(pre_headers, Opts) ++
  -                nksip_lib:get_value(headers, Opts, []) ++
  -                proplists:get_all_values(post_headers, Opts),
  +                proplists:get_all_values(pre_headers, FullOpts) ++
  +                nksip_lib:get_value(headers, FullOpts, []) ++
  +                proplists:get_all_values(post_headers, FullOpts),
           Body = nksip_lib:get_value(body, Opts, <<>>),
           Headers1 = nksip_headers:update(Headers, [
               {default_single, <<"User-Agent">>, UserAgent},
  -            case lists:member(make_allow, Opts) of
  +            case lists:member(make_allow, FullOpts) of
                   true -> {default_single, <<"Allow">>, nksip_sipapp_srv:allowed(AppId)};
                   false -> []
               end,
  -            case lists:member(make_supported, Opts) of
  +            case lists:member(make_supported, FullOpts) of
                   true -> {default_single, <<"Supported">>, ?SUPPORTED};
                   false -> []
               end,
  -            case lists:member(make_accept, Opts) of
  +            case lists:member(make_accept, FullOpts) of
                   true -> {default_single, <<"Accept">>, ?ACCEPT};
                   false -> []
               end,
  -            case lists:member(make_date, Opts) of
  +            case lists:member(make_date, FullOpts) of
                   true -> {default_single, <<"Date">>, nksip_lib:to_binary(
                                                       httpd_util:rfc1123_date())};
                   false -> []
  
positive.code:                     Routes -> ok
                  end
          end,
          case nksip_lib:get_value(contact, Opts, []) of
              [] ->
                  Contacts = [];
              ContactSpec ->
  
negative.code:                     _ -> To = throw(invalid_to) 
                  end
          end,
          case nksip_lib:get_value(route, FullOpts, []) of
              [] ->
                  Routes = [];
              RouteSpec ->
  