search improvements

search isn't perfect yet, but better