                     contact_type,
                     disposition,
                     -- XXX Should this be changed to support other dispositions? Probably...
-                    CASE WHEN contact_type = 'Infant' AND disposition = 'Moved' THEN 1 ELSE 0 END AS out_of_jurisdiction,
+                    CASE WHEN contact_type = 'Infant' AND disposition IN (
+                        'Closed: Transferred to another state',
+                        'Closed: Left state (unable to transfer)',
+                        'Closed: Moved out of country'
+                    ) THEN 1 ELSE 0 END AS out_of_jurisdiction,
                     CASE WHEN contact_type = 'Infant' THEN 1 ELSE 0 END AS infant_contacts,
 
                     -- Here, "24 hours" means the same day. If a dose is given

                                        END    
                                    ELSE -- Not an 'Infant' type
                                        CASE
                                           -- WHEN
                                           --     (
                                           --         COALESCE((trisano.get_contact_hbsag_before(dce.id, CURRENT_DATE)).test_result, 'dummy') = 'Positive / Reactive' OR
                                           --         COALESCE((trisano.get_contact_antihb_before(dce.id, CURRENT_DATE)).test_result, 'dummy') = 'Positive / Reactive'
                                           --     ) 
                                           --     THEN
                                           --         9 -- fdd = report date, act = 'Close Contact'
                                            WHEN
                                                (hepb_dose1_date IS NULL AND hepb_comvax1_date IS NULL) OR
                                                (hepb_dose2_date IS NULL AND hepb_comvax2_date IS NULL) OR
                                                (hepb_dose3_date IS NULL AND hepb_comvax3_date IS NULL) OR
                                                (
                                                    (
                                                        COALESCE((trisano.get_contact_hbsag_before(dce.id, CURRENT_DATE)).test_result, 'dummy') != 'Positive / Reactive' OR
                                                        COALESCE((trisano.get_contact_antihb_before(dce.id, CURRENT_DATE)).test_result, 'dummy') != 'Positive / Reactive'
                                                    ) AND
                                                    hepb_dose6_date IS NULL
                                                )
                                                THEN
                                                    7 -- fdd = report date, act = "Check vaccination history; Test or Vaccinate"
                                            ELSE -1 -- Don't show this contact
                                        END
                                END AS fdd_act_code
                            FROM

                        THEN 1 ELSE 0
                    END AS all_8m_trans,
                    CASE WHEN contact_type = 'Infant' AND
                        disposition IN (
                            'Closed: Transferred to another state',
                            'Closed: Left state (unable to transfer)',
                            'Closed: Moved out of country'
                        ) AND
                        (hepb_dose1_date <= dce.birth_date + INTERVAL '12 months' OR hepb_comvax1_date <= dce.birth_date + INTERVAL '12 months') AND
                        (hepb_dose2_date <= dce.birth_date + INTERVAL '12 months' OR hepb_comvax2_date <= dce.birth_date + INTERVAL '12 months') AND
                        (hepb_dose3_date <= dce.birth_date + INTERVAL '12 months' OR hepb_comvax4_date <= dce.birth_date + INTERVAL '12 months') AND
