Fixed legacy url parsing, closes #1434.
Merge pull request #2046 from cmfcmf/fix-1434

Fixed legacy url parsing, closes #1434.