changes to handling of indexes