Enforce optimal index

We don't have such indexes at the moment :)