Additional fixes for main list view.