Improve standalone tag function calling