correction of indexOf for production api layer