Fix urls generation