Working on save from search