1016339 indexing fixes

r?