updated matching condition to match changes in uipick, should behave the same