SONAR-5623: fix to re-index issues at WS call