Restore optimization to remove select distinct index to be loaded 2

2 jobs for !348 with fix/load-different-index-only in 32 minutes (queued for 4 seconds)
latest merge request