Sup 2198

SUP 2198 fix: keep track of viewed entries and make sure they are always last in the data array