diff --git a/bin/straw-viewer b/bin/straw-viewer
index 45d50b9..b71a268 100755
--- a/bin/straw-viewer
+++ b/bin/straw-viewer
@@ -2951,10 +2951,14 @@ FORMAT
             ## ok
         }
         elsif (valid_num($key, $playlists) and not $contains_keywords) {
+
+            my $id = $yv_utils->get_playlist_id($playlists->[$key - 1]);
+
             if ($args{return_playlist_id}) {
-                return $yv_utils->get_playlist_id($playlists->[$key - 1]);
+                return $id;
             }
-            get_and_print_videos_from_playlist($yv_utils->get_playlist_id($playlists->[$key - 1]));
+
+            get_and_print_videos_from_playlist($id);
         }
         else {
             push @for_search, $key;
diff --git a/lib/WWW/StrawViewer/RegularExpressions.pm b/lib/WWW/StrawViewer/RegularExpressions.pm
index dafc2c3..2bc6a67 100644
--- a/lib/WWW/StrawViewer/RegularExpressions.pm
+++ b/lib/WWW/StrawViewer/RegularExpressions.pm
@@ -26,7 +26,7 @@ our $digit_or_equal_re   = qr/(?(?=[1-9])|=)/;
 our $non_digit_or_opt_re = qr{^(?!$range_num_re)(?>[0-9]{1,3}[^0-9]|[0-9]{4}|[^0-9$opt_begin_chars])};
 
 # Generic name
-my $generic_name_re = qr/[a-zA-Z0-9_.\-]{11,34}/;
+my $generic_name_re = qr/[a-zA-Z0-9_.\-]{11,64}/;
 our $valid_channel_id_re = qr{^(?:.*/channel/)?(?<channel_id>(?:\w+(?:[-.]++\w++)*|$generic_name_re))(?:/.*)?\z};
 
 our $get_channel_videos_id_re    = qr{^.*/channel/(?<channel_id>(?:\w+(?:[-.]++\w++)*|$generic_name_re))};