Bug Fix + Fully replaced the old npc selector.