CLOUD-183 fixed template selection