Add switches to force reindexing and force reloading of enrichment