Fix URL creation