Fixed the big load for the list view pages
Merge branch 'new_branch_name'