Fixed issues creating search indexes