[SG|LL] Fixing empty search bugs/test