Fix urls order