Unique url generation fix