Added uniqueness
Added search key to output filename