Fixed search and add as per Jennys instruction