CAPEDWARF-193 Search service fixes