[Bug 487587] Add Option to Include Sub-indexes