Fix epo list view.
Merge branch 'hot-fixes'