would making this filter through the other destination be better?  Less code repeated