LILY-241: search improved