Add Content NPC in block search + common search improvement