further improvements to make sure names and urls are unique