Added ability to force partial index optimization