Added optional removal of smart search indexing