Tentative of better indexing with embedder