[ENH] improve queries performance when searching for string occurences in the db

• [ENH] improve queries performance when searching for string occurences in the db

(cherry picked from commit 54b6a108)

Orignal merge request: !4374 (merged)