Updating some more interactions and tightening up the filtering error handling.