Tweaking entity decoding.  Don't know how the ampersand replacement got lost.