Improve chist search