Add SearchIndexPosition and minor changes