added basic search and unique filenames