add fix for non-unique urls