Finished search and add functionality