Add search and resolve id