Improve search with more helpful messages