still fixing up search