fix extended cli lookup