Hotfix for survey indexing