MDL-69454 core_search: consistent template library search