Fix url + insert service / environment