@gklopper do this way or url generation look ok to you?