Add multi word search
Merge branch 'feature/multisearch' into develop