That's the primary crux of what v.07 is bringing to fix: Separating NPCs into appropriate factions and keeping them there. ;)
This v0.7 sound amazing cant wait for it :)
