updated with some search improvements