fixed up search