YH-570: smarter search functionality