Currently when doing template searches in the CDC, it searches the entire CMS. In some cases the search times out if there are too many template and library files. The suggestion would be to add filtering on what to search for. For example, we could limit the search to only certain site roots and folders or we could only search library files / template files.