Rework URI injection into catalog template