decorate_url fixed