Added black/white list option for indexing; Cleanup; refs #15265