XLCLOUD-1337 templates correction
XLCLOUD-1337 revert brackets[] modification