LILY-537:search properly with multi tokens
Merge branch 'feature/search-multi-tokens-537' into develop