Fix URL propegation