Fixed legacy url parsing, closes #1434.