Made finding unique urls more robust