Added 4659 for filter_sub