If so, you're right except that Healer is Lyse. Ul'dah isn't included (though might be involved in some kind of wrap up quests once you do them all like Shadowbringers had).