ugly search improvements