ensure urls are created correctly (bug 1021991)