This url composition should also be revised