Make list/grid view work again.
Merge commit '0dc73e8bcb6cfab1a6a177031fb908054455f3b9' into flvc