minor patches to fix search