Rework routing patching

Was clashing with extended_fields plugin