Fix indexing : Remove regex and sort in search query