Fix quality flaws
SONAR-5905 Index Users in E/S