Added template option to CP search