diff --git a/popular.pl b/popular.pl

index a681cc7be286964e80a95af47406ab762231ae56..3dcc60e9a004d6996ab87552ce7be532039e3aca 100755

--- a/popular.pl

+++ b/popular.pl

@@ -35,7 +35,7 @@ my @sorted = sort { $a <=> $b } @$populars;

my $c = 0;

foreach (reverse @sorted) {

my ($cnt, $uri, $name) = split / /, $_, 3;

- push @body, '=> orrg.pl?'. uri_escape($uri) .' '. $name;

+ push @body, '=> orrg.pl?'. uri_escape($uri) .' '. ($name eq '' ? $uri : $name);

++$c < 10 or last;

}

diff --git a/recent.pl b/recent.pl

index bfc2c14271284eadf6dd7334b1982a69aceece11..e9522b7862e2dab631acaff80115c70f30716aec 100755

--- a/recent.pl

+++ b/recent.pl

@@ -33,7 +33,7 @@ my $recents = recent_get();

if ( defined($recents) ) {

foreach (@$recents) {

my ($uri, $name) = split / /, $_, 2;

- push @body, '=> orrg.pl?'. uri_escape($uri) .' '. $name;

+ push @body, '=> orrg.pl?'. uri_escape($uri) .' '. ($name eq '' ? $uri : $name);

}

} else {

push @body, 'No feeds found';