Better bundle template selection