Fix execution post dependency fix, and make sure @map keys still filter on type