Davide D'Alto could you also check how far Search and OGM rules have diverged? Ideally if you could merge improvements from both to both projects, opening an issue on Search if there is need for it.