LILY-537:search properly with multi tokens