Migration of relevant code from search-core