WP-2689 added the tags for theming
WP-2689 updated the return url and field adjust