Bug Fix + NPC with NPC Container selection dialog replace