Fix list page performance issue