Small fix to be able to pass templates by id