Fixes catalog index rebuild and optimizes list indexes for rebuilds

Additionally, prevents removing of order pdate index that is recreated again afterwards