Better fix for relative URLs

An improvement to #2711 

cc @koke 
Oooh, I get what you're saying now.  I guess I just need fresh eyes (and fresh coffee).  Update coming!