Bugfixes - all test passing (deep index name change test pending validation)