added support for legacy url structure