Temporary template selection patch