Fix misattribution of comments when indexed. Refs EMP-215