urls patch reworked