Removing search indexer part II