Reshuffling account and search templates into new template groups