Changing from single search value lookup to multiple field based lookup