Refactor how we're fixing up cosntrain url