cleaned up search