#3424 Use General Visit disposition category for multi-event contacts

This should fix all three bugs referenced in the commit.