diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py
index de9e1b313..afd536394 100644
--- a/beetsplug/lyrics.py
+++ b/beetsplug/lyrics.py
@@ -334,8 +334,8 @@ class LyricsWiki(SymbolsReplaced):
 
         # Get the HTML fragment inside the appropriate HTML element and then
         # extract the text from it.
-        html_frag = extract_text_in(unescape(html), u"<div class='lyricbox'>")
-        lyrics = scrape_lyrics_from_html(html_frag)
+        html_frag = extract_text_in(html, u"<div class='lyricbox'>")
+        lyrics = _scrape_strip_cruft(html_frag, True)
 
         if lyrics and 'Unfortunately, we are not licensed' not in lyrics:
             return lyrics
diff --git a/docs/reference/cli.rst b/docs/reference/cli.rst
index fcef6d23f..faae67ee6 100644
--- a/docs/reference/cli.rst
+++ b/docs/reference/cli.rst
@@ -435,7 +435,10 @@ later on you will want to re-generate the script.
 zsh
 ```
 
-If you use zsh, take a look at the included `completion script`_.
+If you use zsh, take a look at the included `completion script`_. The script
+should be placed in a directory that is part of your ``fpath``, and `not`
+sourced in your ``.zshrc``. Running ``echo $fpath`` will give you a list of
+valid directories.
 
 Another approach is to use zsh's bash completion compatibility. This snippet
 defines some bash-specific functions to make this work without errors::