add support for encoded urls