FIX 'optimize' call frequency reduced

Optimize only called 1% of index calls