Made more progress on filter fail migration work