Fix api tag inside template.
Other changes..