Fixup merge
Use url operator in macro