Refactor list URLs