Fixed url name problems