6/8 further index page fixes