Issue #2983665 by cferthorney, zuhair_ak, Saviktor, John Cook, Eli-T,...

Issue #2983665 by cferthorney, zuhair_ak, Saviktor, John Cook, Eli-T, longwave, alexpott: Inconsistent ordering of views of content in Umami

(cherry picked from commit 374bb899)