Migrated to new hsearch-core