Fixing catalog listing/instantating from REST via yaml