-<td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{end}; %>
-<td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
+<td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{stop}; %>
+<td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>