Fix URL order