LILY-550: Searching words with special chars correctly, use BaseMapping