Fix issues with Swiftype indexer