Fixes organization macro failing with custom catalog