improve switching from search to add