LILY-550: Searching words with special chars correctly
LILY-550: Searching words with special chars correctly, use BaseMapping
Merge branch 'feature/searching-words-with-special-chars-550' into develop