Fixes bug 923049 - Removed risk of sensitive data exposure.
Merge pull request #1554 from AdrianGaudebert/923049-pii-supersearch

Fixes bug 923049 - Removed risk of sensitive data exposure.