Applied changes to list view as well. #15691087372498