some fixes with full example index