Add option to not rebuild search index right away