Fixed CommandNear with entities with underscores