Updated filtering to include list format for link