Better handling of last index to filter display list.