add name and @type in search