Search fixes

reversed search storage so multiple entries for the same type of data
can be searched