Fix indices

This is mainly to address https://github.com/geoadmin/mf-geoadmin3/issues/984

See comments in the above issue.