diff --git a/src/lyrics/azlyricscomlyricsprovider.cpp b/src/lyrics/azlyricscomlyricsprovider.cpp
index 1eabe6901..27b77220d 100644
--- a/src/lyrics/azlyricscomlyricsprovider.cpp
+++ b/src/lyrics/azlyricscomlyricsprovider.cpp
@@ -37,7 +37,7 @@ const char AzLyricsComLyricsProvider::kLyricsStart[] = "<!-- Usage of azlyrics.c
 AzLyricsComLyricsProvider::AzLyricsComLyricsProvider(SharedPtr<NetworkAccessManager> network, QObject *parent)
     : HtmlLyricsProvider("azlyrics.com", true, kStartTag, kEndTag, kLyricsStart, false, network, parent) {}
 
-QUrl AzLyricsComLyricsProvider::GetUrl(const LyricsSearchRequest &request) {
+QUrl AzLyricsComLyricsProvider::Url(const LyricsSearchRequest &request) {
 
   return QUrl(kUrl + StringFixup(request.artist) + "/" + StringFixup(request.title) + ".html");
 
diff --git a/src/lyrics/azlyricscomlyricsprovider.h b/src/lyrics/azlyricscomlyricsprovider.h
index 752304dc2..a30e5dc56 100644
--- a/src/lyrics/azlyricscomlyricsprovider.h
+++ b/src/lyrics/azlyricscomlyricsprovider.h
@@ -39,8 +39,10 @@ class AzLyricsComLyricsProvider : public HtmlLyricsProvider {
   explicit AzLyricsComLyricsProvider(SharedPtr<NetworkAccessManager> network, QObject *parent = nullptr);
 
  protected:
-  QUrl GetUrl(const LyricsSearchRequest &request) override;
-  QString StringFixup(QString string) override;
+  QUrl Url(const LyricsSearchRequest &request) override;
+
+ private:
+  QString StringFixup(QString string);
 
  private:
   static const char kUrl[];
diff --git a/src/lyrics/htmllyricsprovider.cpp b/src/lyrics/htmllyricsprovider.cpp
index dca110964..3c677da97 100644
--- a/src/lyrics/htmllyricsprovider.cpp
+++ b/src/lyrics/htmllyricsprovider.cpp
@@ -51,7 +51,9 @@ HtmlLyricsProvider::~HtmlLyricsProvider() {
 
 bool HtmlLyricsProvider::StartSearch(const int id, const LyricsSearchRequest &request) {
 
-  QUrl url(GetUrl(request));
+  if (request.artist.isEmpty() || request.title.isEmpty()) return false;
+
+  QUrl url(Url(request));
   QNetworkRequest req(url);
   req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
   QNetworkReply *reply = network_->get(req);
diff --git a/src/lyrics/htmllyricsprovider.h b/src/lyrics/htmllyricsprovider.h
index f14d2f828..6d259f7c2 100644
--- a/src/lyrics/htmllyricsprovider.h
+++ b/src/lyrics/htmllyricsprovider.h
@@ -49,8 +49,7 @@ class HtmlLyricsProvider : public LyricsProvider {
   static QString ParseLyricsFromHTML(const QString &content, const QRegularExpression &start_tag, const QRegularExpression &end_tag, const QRegularExpression &lyrics_start, const bool multiple);
 
  protected:
-  virtual QUrl GetUrl(const LyricsSearchRequest &request) = 0;
-  virtual QString StringFixup(QString string) = 0;
+  virtual QUrl Url(const LyricsSearchRequest &request) = 0;
   void Error(const QString &error, const QVariant &debug = QVariant()) override;
 
  protected slots:
diff --git a/src/lyrics/songlyricscomlyricsprovider.cpp b/src/lyrics/songlyricscomlyricsprovider.cpp
index 32dd9b644..2299a2736 100644
--- a/src/lyrics/songlyricscomlyricsprovider.cpp
+++ b/src/lyrics/songlyricscomlyricsprovider.cpp
@@ -37,7 +37,7 @@ const char SongLyricsComLyricsProvider::kLyricsStart[] = "<p id=\"songLyricsDiv\
 SongLyricsComLyricsProvider::SongLyricsComLyricsProvider(SharedPtr<NetworkAccessManager> network, QObject *parent)
     : HtmlLyricsProvider("songlyrics.com", true, kStartTag, kEndTag, kLyricsStart, false, network, parent) {}
 
-QUrl SongLyricsComLyricsProvider::GetUrl(const LyricsSearchRequest &request) {
+QUrl SongLyricsComLyricsProvider::Url(const LyricsSearchRequest &request) {
 
   return QUrl(kUrl + StringFixup(request.artist) + "/" + StringFixup(request.title) + "-lyrics/");
 
diff --git a/src/lyrics/songlyricscomlyricsprovider.h b/src/lyrics/songlyricscomlyricsprovider.h
index b4dec2a37..851e40b83 100644
--- a/src/lyrics/songlyricscomlyricsprovider.h
+++ b/src/lyrics/songlyricscomlyricsprovider.h
@@ -39,8 +39,10 @@ class SongLyricsComLyricsProvider : public HtmlLyricsProvider {
   explicit SongLyricsComLyricsProvider(SharedPtr<NetworkAccessManager> network, QObject *parent = nullptr);
 
  protected:
-  QUrl GetUrl(const LyricsSearchRequest &request) override;
-  QString StringFixup(QString string) override;
+  QUrl Url(const LyricsSearchRequest &request) override;
+
+ private:
+  QString StringFixup(QString string);
 
  private:
   static const char kUrl[];