Save URLs properly