DOCS-1908 final fix to aggregation navigation problem