Fixes for Templates REST